diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
new file mode 100644
index 00000000..abbe54ac
--- /dev/null
+++ b/.devcontainer/Dockerfile
@@ -0,0 +1,8 @@
+from zmkfirmware/zephyr-west-action-arm
+
+RUN apt-get -y update && \
+	apt-get -y upgrade && \
+    apt-get install --no-install-recommends -y \
+    ssh \
+    gpg && \
+    rm -rf /var/lib/apt/lists/*
\ No newline at end of file
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index bbf44bc7..f21465df 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,6 +1,6 @@
 {
   "name": "ZMK Development",
-  "image": "zmkfirmware/zephyr-west-action-arm",
+  "dockerFile": "Dockerfile",
   "extensions": ["ms-vscode.cpptools"],
   "runArgs": ["--security-opt", "label=disable"]
 }