diff --git a/Dockerfile b/Dockerfile
index 84e9350..c32806a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,10 @@
 FROM osrf/ros:jazzy-desktop-full-noble
 
-SHELL [ "/bin/bash" , "-c" ]
-
 USER ubuntu
 # Add sourcing ROS setup.bash to .bashrc
 RUN echo "source /opt/ros/${ROS_DISTRO}/setup.bash" >> ~/.bashrc
 RUN echo "source /usr/share/colcon_cd/function/colcon_cd.sh" >> ~/.bashrc
 RUN echo "source /usr/share/colcon_argcomplete/hook/colcon-argcomplete.bash" >> ~/.bashrc
-RUN echo "export _colcon_cd_root=/opt/ros/jazzy/" >> ~/.bashrc
\ No newline at end of file
+RUN echo "export _colcon_cd_root=/opt/ros/jazzy/" >> ~/.bashrc
+
+SHELL [ "/bin/bash" , "-c" ]
diff --git a/devcontainer.json b/devcontainer.json
index 3eac583..7a49d31 100644
--- a/devcontainer.json
+++ b/devcontainer.json
@@ -14,11 +14,11 @@
 	],
 	"workspaceMount": "source=${localWorkspaceFolder},target=/${localWorkspaceFolderBasename},type=bind",
 	"workspaceFolder": "/${localWorkspaceFolderBasename}",
-	// for linux
-	"containerEnv": {
-		// Uncomment to allow the container to access the X server on the host e.g. to run Rviz and other GUI tools
-		"DISPLAY": "${localEnv:DISPLAY}", 
-		"TZ": "Europe/Amsterdam"
+	"remoteEnv": {
+		"DISPLAY": "${localEnv:DISPLAY}",
+		"TZ": "Europe/Amsterdam",
+		"DBUS_SESSION_BUS_ADDRESS": "unix:path=/run/user/1000/bus",
+		"XDG_RUNTIME_DIR": "/run/user/1000"
 	},
 	"mounts": [
 		// Uncomment to allow the container to access the X server on the host e.g. to run Rviz and other GUI tools
@@ -38,6 +38,11 @@
 			"source": "/dev/dri",
 			"target": "/dev/dri",
 			"type": "bind"
+		},
+		{
+			"source": "/run/user/1000/bus",
+			"target": "/run/user/1000/bus",
+			"type": "bind"
 		}
 	],
 	"customizations": {