diff --git a/dist/platforms/ubuntu/entrypoint.sh b/dist/platforms/ubuntu/entrypoint.sh
index 45664ccd..3824aaf0 100755
--- a/dist/platforms/ubuntu/entrypoint.sh
+++ b/dist/platforms/ubuntu/entrypoint.sh
@@ -13,7 +13,6 @@ mkdir -p "/home/$USERNAME"
 chown $USERNAME:$GROUPNAME "/home/$USERNAME"
 
 # Switch to the host user so we can create files with the correct ownership
-su - $USERNAME -c 'source /steps/runsteps.sh'
+su - $USERNAME -c "$SHELL -c 'source /steps/runsteps.sh'"
 
-# Exiting main script
-exit $BUILD_EXIT_CODE
+exit $?