diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 4a28457..a1bb980 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -3,20 +3,22 @@ ARG ROS_DISTRO=humble
 
 FROM ${BASE_IMAGE} AS devcontainer
 
+ENV main_user=${USER:-root}
+
+USER root
 RUN rm -rf /var/lib/apt/lists/* \
     && apt-get update --fix-missing \
     && apt-get -y install --no-install-recommends --fix-missing \
-    ros-${ROS_DISTRO}-desktop \
-    bash-completion \
+        bash-completion \
     && rm -rf /var/lib/apt/lists/*
 
-COPY ./ /workspace/
 WORKDIR /workspace
-
 ENV ROS2_WS=/workspace
-RUN rosdep update --rosdistro ${ROS_DISTRO} &&\
-    apt-get update && \
-    rosdep install --from-paths ./src --ignore-src -r -y
+RUN --mount=type=bind,source=.,target=/workspace rosdep update --rosdistro ${ROS_DISTRO} \
+    && apt-get update \
+    && rosdep install --from-paths /workspace/src --ignore-src -r -y
+
+USER ${main_user}
 
 # Do an initial build to speed up development
 RUN /bin/bash -lc "source /opt/ros/${ROS_DISTRO}/setup.bash && colcon build --continue-on-error"
@@ -26,4 +28,4 @@ FROM devcontainer AS final
 
 RUN /bin/bash -lc "source /opt/ros/${ROS_DISTRO}/setup.bash && colcon build"
 
-CMD ["/bin/bash", "-lc", "source /workspace/install/setup.bash && exec ros2 launch example example.launch.py"]
+CMD ["/bin/bash", "-lc", "source /workspace/install/setup.bash && exec ros2 launch example example.launch.py"]
\ No newline at end of file
diff --git a/.github/workflows/build-docker.yml.off b/.github/workflows/build-docker.yml
similarity index 100%
rename from .github/workflows/build-docker.yml.off
rename to .github/workflows/build-docker.yml
diff --git a/.github/workflows/dev-container.yml.off b/.github/workflows/dev-container.yml
similarity index 94%
rename from .github/workflows/dev-container.yml.off
rename to .github/workflows/dev-container.yml
index 11c6f93..46e8e18 100644
--- a/.github/workflows/dev-container.yml.off
+++ b/.github/workflows/dev-container.yml
@@ -34,5 +34,3 @@ jobs:
           imageName: devcontainer/${{ steps.docker_image_name.outputs.docker_image }}
           configFile: ./.devcontainer/devcontainer.json
           push: never
-          cacheFrom: type=gha
-          cacheTo: type=gha,mode=max
diff --git a/.github/workflows/ros-ci.yml.off b/.github/workflows/ros-ci.yml
similarity index 100%
rename from .github/workflows/ros-ci.yml.off
rename to .github/workflows/ros-ci.yml