diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 1b839defe..12fef5507 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,22 +1,9 @@
-FROM geerlingguy/docker-debian12-ansible:latest
+FROM ghcr.io/devture/ansible:11.1.0-r0-0
 
-ENV LANG=C.UTF-8
-ENV LC_ALL=C.UTF-8
-
-RUN apt-get update && \
-	apt-get install -y --no-install-recommends \
-		python3-passlib \
-		git \
-		pwgen \
-		openssh-client \
-		curl && \
-	rm -rf /var/lib/apt/lists/* && \
-	rm -Rf /usr/share/doc && rm -Rf /usr/share/man && \
-	apt-get clean
-
-# Install Just
-RUN curl --proto '=https' --tlsv1.2 -sSf https://just.systems/install.sh | bash -s -- --to /usr/local/bin
+# Install additional packages
+RUN apk add --no-cache \
+	pwgen
 
 # Preserve command history across container restarts
-RUN SNIPPET="export PROMPT_COMMAND='history -a' && export HISTFILE=/commandhistory/.bash_history" \
-    && echo "$SNIPPET" >> "/root/.bashrc"
+RUN SNIPPET="export HISTFILE=/commandhistory/.ash_history" \
+	&& echo "$SNIPPET" >> "/root/.profile"
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 32327e434..5cf3a48a1 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -6,24 +6,15 @@
 		"context": ".."
 	},
 	"postCreateCommand": {
-		"Fix Volume Permissions": "sudo chown -R $(whoami): /commandhistory"
+		"Fix Volume Permissions": "chown -R $(whoami): /commandhistory"
 	},
-	"postAttachCommand": "bash",
 	"mounts": [
-		{
-			"source": "${localEnv:SSH_AUTH_SOCK}",
-			"target": "/agent.sock",
-			"type": "bind"
-		},
 		{
 			"source": "matrix-docker-ansible-deploy-bashhistory",
 			"target": "/commandhistory",
 			"type": "volume"
 		}
 	],
-	"containerEnv": {
-		"SSH_AUTH_SOCK": "/agent.sock"
-	},
 	"customizations": {
 		"vscode": {
 			"extensions": [