diff --git a/Dockerfile b/Dockerfile
index 7d30696d4a..51c91bc542 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,6 +20,9 @@ RUN <<END
 
   # Ensure all *.sh scripts are executable.
   find . -name node_modules -prune -or -type f -name '*.sh' -print -exec chmod +x '{}' ';'
+
+  # Ensure all custom command-scripts have executable permission
+  chmod +x /opt/bin/*
 END
 
 #Add the jar to the container
diff --git a/app/client/cypress/setup-test-ci.sh b/app/client/cypress/setup-test-ci.sh
index 756b70f2f0..55a882bcd7 100644
--- a/app/client/cypress/setup-test-ci.sh
+++ b/app/client/cypress/setup-test-ci.sh
@@ -39,6 +39,7 @@ echo "status code: $status_code"
 
 if [ "$status_code" -eq "502" ]; then
   echo "Unable to connect to server"
+  docker logs appsmith
   exit 1
 fi