diff --git a/deploy/Dockerfile b/deploy/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..0b55d4e5d28d683ffb340eacfbde09bcea6b11ed
--- /dev/null
+++ b/deploy/Dockerfile
@@ -0,0 +1,6 @@
+FROM industrial_ci_image
+
+COPY ./ros_entrypoint.bash /
+
+ENTRYPOINT ["/ros_entrypoint.bash"]
+CMD ["bash"]
diff --git a/deploy/ros_entrypoint.bash b/deploy/ros_entrypoint.bash
new file mode 100644
index 0000000000000000000000000000000000000000..01fe41cd7ccee5b782acc9bbc7b1a508f1e00221
--- /dev/null
+++ b/deploy/ros_entrypoint.bash
@@ -0,0 +1,6 @@
+#!/bin/bash
+set -e
+
+# setup application environment
+source "/root/catkin_ws/install/setup.bash"
+exec "$@"
diff --git a/scripts/pre-deploy-cleanup.bash b/scripts/pre-deploy-cleanup.bash
new file mode 100644
index 0000000000000000000000000000000000000000..eb331394df938c7d39b8562c5e8a617d359378fb
--- /dev/null
+++ b/scripts/pre-deploy-cleanup.bash
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -e
+
+rm -rf /root/catkin_ws/build /root/catkin_ws/devel /root/catkin_ws/src /root/ici /root/src
+
+# Unset env vars?