diff --git a/dockerfile.arm64 b/dockerfile.arm64
index 2b70815..54d2959 100644
--- a/dockerfile.arm64
+++ b/dockerfile.arm64
@@ -44,11 +44,18 @@ RUN git clone https://github.com/bjoernellens1/segwayrmp -b humble-arm64
 
 
 # Build the workspace
+WORKDIR /home/ros/workspace
 RUN . /opt/ros/humble/setup.sh && \
     colcon build
 
+#WORKDIR /home/ros/workspace
+
+# Set up the ROS environment
+RUN echo "source /opt/ros/humble/setup.bash" >> /home/ros/.bashrc && \
+    echo "source /home/ros/workspace/install/setup.bash" >> /home/ros/.bashrc
+
 # Set the entrypoint to the workspace and run the shell
-ENTRYPOINT ["/bin/bash", "-c", ". /opt/ros/humble/setup.sh && . install/setup.sh && cd src && /bin/bash"]
+#ENTRYPOINT ["/bin/bash", "-c", ". /opt/ros/humble/setup.bash && cd /home/ros/workspace && source /home/ros/workspace/install/setup.bash && /bin/bash"]
 
 # Set the default command to start a new shell in the workspace
 CMD ["/bin/bash"]