diff --git a/playbook-template/bootstrap.sh b/playbook-template/bootstrap.sh
index dfb40740b693f1b04d3872b2841a14ed14221f78..cfe3f4717ebd198f99f91d8f38d4f90eadcdc502 100644
--- a/playbook-template/bootstrap.sh
+++ b/playbook-template/bootstrap.sh
@@ -37,5 +37,10 @@ source .venv/bin/activate
 pip install -r requirements.python.txt
 ansible-galaxy install -r requirements.galaxy.yml
 ansible-playbook -i inventory.yaml playbook.yml
+
 # to stay in our comfy virtualenv
-exec bash
+if [[ -n "$SHELL" ]]
+then
+  SHELL="bash"
+fi
+exec "$SHELL"