diff --git a/setup.sh b/setup.sh
index 899e036..f59874d 100755
--- a/setup.sh
+++ b/setup.sh
@@ -11,6 +11,4 @@ chmod -R 777 .
 
 echo "[setup.sh] Tenancy version: ${TENANCY_VERSION}"
 
-docker run --rm -e TENANCY_VERSION="${TENANCY_VERSION}" -v .:/var/www/html tenancy-queue-test-cli bash setup/_tenancy_setup.sh
-
-chmod -R 777 .
+docker run --rm -e TENANCY_VERSION="${TENANCY_VERSION}" -v .:/var/www/html tenancy-queue-test-cli bash -c 'setup/_tenancy_setup.sh; chmod -R 777 .'