diff --git a/docker/Dockerfile b/docker/Dockerfile
index 2ea7e23..b757f88 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -62,12 +62,6 @@ RUN source /${UNDERLAY_WS}/install/setup.bash \
 COPY ./docker/entrypoint.sh /
 RUN chmod +x /entrypoint.sh
 
-COPY ./controller_startup.sh /
-RUN chmod +x /controller_startup.sh
-
-COPY ./localization_startup.sh /
-RUN chmod +x /localization_startup.sh
-
 ENTRYPOINT [ "/entrypoint.sh" ]
 
 ###########################################
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
new file mode 100644
index 0000000..c7d19f8
--- /dev/null
+++ b/docker/entrypoint.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+# Basic entrypoint for ROS / Colcon Docker containers
+
+# Source ROS 2
+source /opt/ros/${ROS_DISTRO}/setup.bash
+echo "Sourced ROS 2 ${ROS_DISTRO}"
+
+# Source the base workspace, if built
+if [ -f ${UNDERLAY_WS}/install/setup.bash ]
+then
+  source ${UNDERLAY_WS}/install/setup.bash
+  echo "Sourced CPS Bot Mini base workspace"
+fi
+
+# Source the overlay workspace, if built
+if [ -f /overlay_ws/install/setup.bash ]
+then
+  source /overlay_ws/install/setup.bash
+  echo "Sourced CPS BOt Mini Overlay workspace"
+fi
+
+# Execute the command passed into this entrypoint
+exec "$@"
\ No newline at end of file