diff --git a/jenkins.pkr.hcl b/jenkins.pkr.hcl
index 99524de..20719fe 100644
--- a/jenkins.pkr.hcl
+++ b/jenkins.pkr.hcl
@@ -18,7 +18,7 @@ build {
   sources = ["source.amazon-ebs.ubuntu"]
 
   provisioner "shell" {
-    execute_command = "chmod +x {{ .Path }}; {{ .Vars }} sudo -S -E sh -eux '{{ .Path }}'"
+    execute_command = "chmod +x {{ .Path }}; {{ .Vars }} sudo -S -E bash -eux '{{ .Path }}'"
     environment_vars = [
       "DEBIAN_FRONTEND=noninteractive"
     ]
@@ -37,7 +37,7 @@ build {
 
 
   provisioner "shell" {
-    execute_command = "chmod +x {{ .Path }}; {{ .Vars }} sudo -S -E sh -eux '{{ .Path }}'"
+    execute_command = "chmod +x {{ .Path }}; {{ .Vars }} sudo -S -E bash -eux '{{ .Path }}'"
     environment_vars = [
       "DEBIAN_FRONTEND=noninteractive",
       "DOMAIN=${var.domain}",
diff --git a/scripts/setup-caddy.sh b/scripts/setup-caddy.sh
index 355ac92..4967c84 100644
--- a/scripts/setup-caddy.sh
+++ b/scripts/setup-caddy.sh
@@ -21,7 +21,7 @@ echo "Setting up Caddy for domain: $DOMAIN with email: $EMAIL"
 
 sudo mkdir -p /etc/caddy
 
-if [[ $ENVIRONMENT = "PRODUCTION" ]]; then
+if [[ "$ENVIRONMENT" = "PRODUCTION" ]]; then
 cat << EOF > /etc/caddy/Caddyfile
 {
     email $EMAIL