diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 4ab569a..395daca 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -4,7 +4,7 @@
   "name": "CFC - Devenv",
   // You can get the sha256 here https://github.com/codersforcauses/automated-setups/pkgs/container/cfc-devenv
   // Pin it to a specific version to avoid unnecessary breaking changes
-  "image": "ghcr.io/codersforcauses/cfc-devenv@sha256:d2fae3d7e7d8f75aa901ccd9beaac0cfd1634e44ad51d3ede6faaa9bb51c8e1b",
+  "image": "ghcr.io/codersforcauses/cfc-devenv@sha256:a739aeff96bdb2b9beb09f9dd14ca8cb5d84045e0896841535114481a59760c7",
 
   "features": {},
 
diff --git a/.github/workflows/devcontainers.yml b/.github/workflows/devcontainers.yml
index 1c5251c..f458515 100644
--- a/.github/workflows/devcontainers.yml
+++ b/.github/workflows/devcontainers.yml
@@ -2,7 +2,7 @@ name: "Devcontainer CI/CD"
 
 on:
   push:
-    branches: ["main", "FEAT/github-cache"]
+    branches: ["main", "FEAT/*"]
     paths:
       - cfc-devenv-base/**
       - .github/workflows/devcontainers.yml
diff --git a/cfc-devenv-base/.devcontainer/devcontainer.json b/cfc-devenv-base/.devcontainer/devcontainer.json
index 300b804..2fd5083 100644
--- a/cfc-devenv-base/.devcontainer/devcontainer.json
+++ b/cfc-devenv-base/.devcontainer/devcontainer.json
@@ -11,10 +11,7 @@
   },
 
   "features": {
-    "ghcr.io/devcontainers/features/docker-outside-of-docker:1": {
-      "version": "latest",
-      "enableNonRootDocker": "true"
-    },
+    "ghcr.io/devcontainers/features/docker-in-docker:2": {},
     "ghcr.io/devcontainers/features/git:1": {},
     "ghcr.io/devcontainers/features/github-cli:1": {},
     "ghcr.io/devcontainers/features/node:1": {},
@@ -58,7 +55,6 @@
       "extensions": [
         "mhutchie.git-graph",
         "eamodio.gitlens",
-        "ms-azuretools.vscode-docker",
         "github.vscode-github-actions",
         "johnpapa.vscode-peacock",
         "timonwong.shellcheck",