diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
new file mode 100644
index 000000000..2f3471582
--- /dev/null
+++ b/.devcontainer/Dockerfile
@@ -0,0 +1,7 @@
+FROM mcr.microsoft.com/devcontainers/base:noble
+RUN if id "vscode" &>/dev/null; then \
+            echo "Deleting user 'vscode' for noble" && userdel -f -r vscode || echo "Failed to delete vscode user for noble"; \  
+        else \
+            echo "User 'vscode' does not exist for noble"; \ 
+    fi
+    
\ No newline at end of file
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 956d8cbe5..6e8fc507f 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,8 +1,17 @@
 {
-    "image": "mcr.microsoft.com/devcontainers/javascript-node:0-18",
+    "build": {
+	"dockerfile":"Dockerfile"
+	},
     "features": {
         "ghcr.io/devcontainers/features/docker-in-docker:2": {},
-        "ghcr.io/devcontainers/features/azure-cli:1": {}
+        "ghcr.io/devcontainers/features/azure-cli:1": {},
+		"ghcr.io/devcontainers/features/common-utils:2": {
+            "username": "node",
+			"userUid": "1000",
+			"userGid": "1000"
+		},
+		"ghcr.io/devcontainers/features/node:1": {},
+		"ghcr.io/devcontainers/features/git-lfs:1": {}
     },
     "postCreateCommand": "npm install -g @devcontainers/cli",
     "customizations": {
@@ -13,5 +22,6 @@
                 "EditorConfig.EditorConfig"
             ]
         }
-    }
+    },
+    "remoteUser":"node"
 }