diff --git a/config/.devcontainer/Dockerfile b/config/.devcontainer/Dockerfile
index c7f7cba68dee00ed04c2cdd5cb94c80ed0406caa..cf113cc7a0c9221ac85f4ce76ca69f0e367b6108 100644
--- a/config/.devcontainer/Dockerfile
+++ b/config/.devcontainer/Dockerfile
@@ -29,9 +29,9 @@ WORKDIR /home/$USERNAME
 # ********************************************************
 
 # [Optional] Clone dotfiles and apply configuration
-# RUN git clone https://github.com/andsens/homeshick.git /home/$USERNAME/.homesick/repos/homeshick \
-#     && /home/$USERNAME/.homesick/repos/homeshick/bin/homeshick clone anfemosa/dotfiles \
-#     && /home/$USERNAME/.homesick/repos/homeshick/bin/homeshick -f link dotfiles
+RUN git clone https://github.com/andsens/homeshick.git /home/$USERNAME/.homesick/repos/homeshick \
+    && /home/$USERNAME/.homesick/repos/homeshick/bin/homeshick clone anfemosa/dotfiles \
+    && /home/$USERNAME/.homesick/repos/homeshick/bin/homeshick -f link dotfiles
 
 CMD ["${SHELL}"]
 
diff --git a/config/.devcontainer/devcontainer.json b/config/.devcontainer/devcontainer.json
index bf25fb3eb2dd541cfa4a8bd006c7a7e53abb0308..e135a16bd7acce4a9866cd082bffe6c3b6fc74c7 100644
--- a/config/.devcontainer/devcontainer.json
+++ b/config/.devcontainer/devcontainer.json
@@ -5,7 +5,8 @@
     "build": {
         "dockerfile": "Dockerfile",
         "args": {
-            "USERNAME": "andres"
+            "USERNAME": "andres",
+            "SHELL": "/bin/zsh"
         }
     },
     "workspaceFolder": "/home/ws",
diff --git a/config/.vscode/tasks.json b/config/.vscode/tasks.json
index 90cf57d53309db6efc183a7576c826f0012a87eb..e0bae72e4a790787473af71d4278cc1db1ce3516 100644
--- a/config/.vscode/tasks.json
+++ b/config/.vscode/tasks.json
@@ -7,11 +7,12 @@
             "label": "colcon: build (debug)",
             "type": "shell",
             "command": [
-                "source /opt/ros/humble/setup.zsh;",
+                "source /opt/ros/humble/setup.${ext};",
                 "colcon build",
                 "--symlink-install",
                 "--cmake-args -DCMAKE_BUILD_TYPE=Debug",
-                "--packages-skip allegro_hand_weiss"
+                "--packages-skip allegro_hand_weiss;",
+                "source ${workspaceFolder}/install/setup.${ext};"
             ],
             "problemMatcher": [],
             "group": {
@@ -23,10 +24,11 @@
             "label": "colcon: build",
             "type": "shell",
             "command": [
-                "source /opt/ros/humble/setup.zsh;",
+                "source /opt/ros/humble/setup.${ext};",
                 "colcon build",
                 "--symlink-install",
-                "--packages-skip allegro_hand_weiss"
+                "--packages-skip allegro_hand_weiss",
+                "source ${workspaceFolder}/install/setup.${ext};"
             ],
             "problemMatcher": [],
             "group": {
@@ -45,12 +47,19 @@
             "label": "colcon: test",
             "type": "shell",
             "command": [
-                "source /opt/ros/humble/setup.zsh;",
-                "source install/setup.zsh;",
+                "source /opt/ros/humble/setup.${ext};",
+                "source install/setup.${ext};",
                 "colcon test",
                 "--packages-select <package-name>",
                 "--event-handlers console_direct+;"
             ]
-        }
+        },
+        {
+            "label": "workspace: source",
+            "type": "shell",
+            "command": [
+                "source ${workspaceFolder}/install/setup.${ext};"
+            ]
+        },
     ]
 }
\ No newline at end of file