diff --git a/.devcontainer/linux/devcontainer.json b/.devcontainer/linux/devcontainer.json
index f40d952..d1edaf5 100644
--- a/.devcontainer/linux/devcontainer.json
+++ b/.devcontainer/linux/devcontainer.json
@@ -2,15 +2,11 @@
     "name": "px4_roscon_25_linux",
     "image": "dronecode/roscon-25-workshop:latest",
     "forwardPorts": [8765],
-    "containerEnv": {
-        "NVIDIA_VISIBLE_DEVICES": "all",
-        "NVIDIA_DRIVER_CAPABILITIES": "all"
-    },
     "remoteEnv": {
         "DISPLAY": "${localEnv:DISPLAY}"
     },
     "runArgs": [
-        "--runtime", "nvidia"
+        "--device", "/dev/dri:/dev/dri"
     ],
     "mounts": [
         {
diff --git a/.devcontainer/nogui/devcontainer.json b/.devcontainer/nogui/devcontainer.json
index 4a6d9bf..b62c4bf 100644
--- a/.devcontainer/nogui/devcontainer.json
+++ b/.devcontainer/nogui/devcontainer.json
@@ -1,5 +1,5 @@
 {
-    "name": "px4_roscon_25_linux",
+    "name": "px4_roscon_25_nogui",
     "image": "dronecode/roscon-25-workshop:latest",
     "forwardPorts": [8765, 18750],
     "customizations": {
diff --git a/docker/docker_run.sh b/docker/docker_run.sh
index a54dd91..d459d29 100755
--- a/docker/docker_run.sh
+++ b/docker/docker_run.sh
@@ -47,6 +47,7 @@ fi
 DOCKER_CMD="$DOCKER_CMD -p 8765:8765"
 DOCKER_CMD="$DOCKER_CMD -v ${SCRIPTPATH}/..:/home/ubuntu/roscon-25-workshop_ws/src/roscon-25-workshop"
 DOCKER_CMD="$DOCKER_CMD --name=px4-roscon-25"
+DOCKER_CMD="$DOCKER_CMD -w /home/ubuntu/roscon-25-workshop_ws"
 DOCKER_CMD="$DOCKER_CMD dronecode/roscon-25-workshop bash"
 
 # Execute the command