diff --git a/src/.devcontainer/devcontainer.json.jinja b/src/.devcontainer/devcontainer.json.jinja
index 1ca0c8e..95169a1 100644
--- a/src/.devcontainer/devcontainer.json.jinja
+++ b/src/.devcontainer/devcontainer.json.jinja
@@ -1,5 +1,5 @@
 {
-    "workspaceFolder": "/home/ros2-workspace/src/",
+    "workspaceFolder": "/home/ros2-workspace/src/{{PACKAGE_NAME}}",
     "name": "ros2-ament_cmake-devcontainer",
     "dockerComposeFile": "../docker-compose.yml",
     "service": "ros2-ament_cmake-test",
diff --git a/src/Dockerfile.jinja b/src/Dockerfile.jinja
index 5201f79..1e1bfaa 100644
--- a/src/Dockerfile.jinja
+++ b/src/Dockerfile.jinja
@@ -30,4 +30,5 @@ RUN echo "source /opt/ros/${ROS_DISTRO}/setup.bash" >> ~/.bashrc
 RUN echo "source ${WS}/src/install/setup.bash" >> ~/.bashrc
 
 #FIX ME
-ENTRYPOINT ["/bin/bash","-c","source ${WS}/src/install/setup.bash && {{RUN_COMMAND}}"]
\ No newline at end of file
+ENTRYPOINT ["/bin/bash","-c","source ${WS}/src/install/setup.bash"]
+CMD {{RUN_COMMAND}}