diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 191e6a6ac..e125ea834 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,6 +1,6 @@
 # See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.195.0/containers/javascript-node/.devcontainer/base.Dockerfile
-# [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 16, 14, 12, 16-bullseye, 14-bullseye, 12-bullseye, 16-buster, 14-buster, 12-buster
-ARG VARIANT=20-bookworm
+# [Choice] Node.js version/variant (use -bookworm variants on local arm64/Apple Silicon): e.g. 22-bookworm, 20-bookworm, 18-bookworm
+ARG VARIANT=22-bookworm
 FROM mcr.microsoft.com/devcontainers/javascript-node:1-${VARIANT}
 
 # [Optional] Uncomment this section to install additional OS packages.
@@ -23,7 +23,10 @@ RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-$(uname -m).zip" -o "aws
   rm -rf ./aws && \
   rm awscliv2.zip
 # Install sam cli
-RUN curl -L "https://github.com/aws/aws-sam-cli/releases/latest/download/aws-sam-cli-linux-$(dpkg --print-architecture).zip" -o "aws-sam-cli.zip" && \
+RUN ARCH_RAW=$(uname -m) && \
+  ARCH=$ARCH_RAW && \
+  if [ "$ARCH_RAW" = "aarch64" ]; then ARCH="arm64"; fi && \
+  curl -L "https://github.com/aws/aws-sam-cli/releases/latest/download/aws-sam-cli-linux-${ARCH}.zip" -o "aws-sam-cli.zip" && \
   unzip aws-sam-cli.zip -d sam-installation && \
   sudo ./sam-installation/install && \
   rm -rf ./sam-installation && \
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 62232b1da..38626686f 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -4,10 +4,10 @@
 	"name": "Node.js",
 	"build": {
 		"dockerfile": "Dockerfile",
-		// Update 'VARIANT' to pick a Node version: 16, 14, 12.
-		// Append -bullseye or -buster to pin to an OS version.
-		// Use -bullseye variants on local arm64/Apple Silicon.
-		"args": { "VARIANT": "20-bookworm" }
+		// Update 'VARIANT' to pick a Node version, e.g. 22, 20, 18.
+		// Append -bookworm or -bullseye to pin to an OS version.
+		// Use -bookworm variants on local arm64/Apple Silicon.
+		"args": { "VARIANT": "22-bookworm" }
 	},
 
 	"settings": {},
diff --git a/package-lock.json b/package-lock.json
index e86a8fcfd..130a1e52c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,7 +15,7 @@
         "eta": "^3.5.0",
         "js-yaml": "^4.1.0",
         "lodash": "^4.17.21",
-        "minimatch": "^10.0.1",
+        "minimatch": "^10.2.1",
         "node-cron": "^4.2.1",
         "octokit": "^5.0.2",
         "probot": "^14.2.4",