From 6d7f72e3a77f04ffa4a713fa812709667aa83a30 Mon Sep 17 00:00:00 2001
From: Joe Lombrozo <joe.lombrozo@e2b.dev>
Date: Sat, 30 May 2026 01:19:22 -0400
Subject: [PATCH 1/9] support configuring versions

---
 iac/nomad-cluster-disk-image/setup/install-consul.sh     | 4 ++--
 iac/nomad-cluster-disk-image/setup/install-nomad.sh      | 2 +-
 iac/provider-aws/nomad-cluster-disk-image/Makefile       | 9 ++++++++-
 iac/provider-aws/nomad-cluster-disk-image/main.pkr.hcl   | 2 +-
 .../nomad-cluster-disk-image/variables.pkr.hcl           | 5 +++++
 5 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/iac/nomad-cluster-disk-image/setup/install-consul.sh b/iac/nomad-cluster-disk-image/setup/install-consul.sh
index c1e4767c97..5a2eb82d09 100644
--- a/iac/nomad-cluster-disk-image/setup/install-consul.sh
+++ b/iac/nomad-cluster-disk-image/setup/install-consul.sh
@@ -123,7 +123,7 @@ function install_binary {
   local -r bin_dir="$install_path/bin"
   local -r consul_dest_path="$bin_dir/consul"
 
-  unzip -d /tmp "$DOWNLOAD_PACKAGE_PATH"
+  unzip -n -d /tmp "$DOWNLOAD_PACKAGE_PATH"
 
   log_info "Moving Consul binary to $consul_dest_path"
   sudo mv "/tmp/consul" "$consul_dest_path"
@@ -243,4 +243,4 @@ function install {
   fi
 }
 
-install "$@"
\ No newline at end of file
+install "$@"
diff --git a/iac/nomad-cluster-disk-image/setup/install-nomad.sh b/iac/nomad-cluster-disk-image/setup/install-nomad.sh
index 34358b00d7..75dec84b75 100755
--- a/iac/nomad-cluster-disk-image/setup/install-nomad.sh
+++ b/iac/nomad-cluster-disk-image/setup/install-nomad.sh
@@ -141,7 +141,7 @@ function install_binaries {
 
   log_info "Downloading Nomad $version from $url to $download_path"
   curl -o "$download_path" "$url"
-  unzip -d /tmp "$download_path"
+  unzip -n -d /tmp "$download_path"
 
   log_info "Moving Nomad binary to $nomad_dest_path"
   sudo mv "/tmp/nomad" "$nomad_dest_path"
diff --git a/iac/provider-aws/nomad-cluster-disk-image/Makefile b/iac/provider-aws/nomad-cluster-disk-image/Makefile
index eea0bfa4f3..0b180816cb 100644
--- a/iac/provider-aws/nomad-cluster-disk-image/Makefile
+++ b/iac/provider-aws/nomad-cluster-disk-image/Makefile
@@ -5,7 +5,14 @@ init:
 	packer init -upgrade .
 
 build:
-	packer build -var "prefix=$(PREFIX)" -var "aws_region=$(AWS_REGION)" -var "aws_profile=$(AWS_PROFILE)" -var "vpc_id=$(PACKER_VPC_ID)" -var "subnet_id=$(PACKER_SUBNET_ID)"  .
+	packer build \
+		-var "consul_version=$(CONSUL_VERSION)" \
+		-var "nomad_version=$(NOMAD_VERSION)" \
+		-var "prefix=$(PREFIX)" \
+		-var "aws_region=$(AWS_REGION)" \
+		-var "aws_profile=$(AWS_PROFILE)" \
+		-var "vpc_id=$(PACKER_VPC_ID)" \
+		-var "subnet_id=$(PACKER_SUBNET_ID)" .
 
 format:
 	packer fmt .
diff --git a/iac/provider-aws/nomad-cluster-disk-image/main.pkr.hcl b/iac/provider-aws/nomad-cluster-disk-image/main.pkr.hcl
index 2b593b23ca..fd35da9bf2 100644
--- a/iac/provider-aws/nomad-cluster-disk-image/main.pkr.hcl
+++ b/iac/provider-aws/nomad-cluster-disk-image/main.pkr.hcl
@@ -24,7 +24,7 @@ source "amazon-ebs" "ubuntu" {
   // Ubuntu Server 24.04 LTS (HVM), SSD Volume Type
   source_ami_filter {
     filters = {
-      name                = "ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-*"
+      name                = var.source_ami_filter_name
       root-device-type    = "ebs"
       virtualization-type = "hvm"
     }
diff --git a/iac/provider-aws/nomad-cluster-disk-image/variables.pkr.hcl b/iac/provider-aws/nomad-cluster-disk-image/variables.pkr.hcl
index 4cef65f01c..dad3887547 100644
--- a/iac/provider-aws/nomad-cluster-disk-image/variables.pkr.hcl
+++ b/iac/provider-aws/nomad-cluster-disk-image/variables.pkr.hcl
@@ -6,6 +6,11 @@ variable "aws_profile" {
   type = string
 }
 
+variable "source_ami_filter_name" {
+  type = string
+  default = "ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-*"
+}
+
 variable "prefix" {
   type = string
 }

From e00a6fc7c4b6e192a078c8034e41ef7dc9a59245 Mon Sep 17 00:00:00 2001
From: Joe Lombrozo <joe.lombrozo@e2b.dev>
Date: Sat, 30 May 2026 01:37:14 -0400
Subject: [PATCH 2/9] support overriding consul/nomad/vault

---
 iac/provider-aws/nomad-cluster-disk-image/Makefile | 10 ++++++----
 iac/provider-gcp/nomad-cluster-disk-image/Makefile | 10 +++++++++-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/iac/provider-aws/nomad-cluster-disk-image/Makefile b/iac/provider-aws/nomad-cluster-disk-image/Makefile
index 0b180816cb..65d466628f 100644
--- a/iac/provider-aws/nomad-cluster-disk-image/Makefile
+++ b/iac/provider-aws/nomad-cluster-disk-image/Makefile
@@ -6,13 +6,15 @@ init:
 
 build:
 	packer build \
-		-var "consul_version=$(CONSUL_VERSION)" \
-		-var "nomad_version=$(NOMAD_VERSION)" \
+		$(if $(CONSUL_VERSION),-var "consul_version=$(CONSUL_VERSION)") \
+		$(if $(NOMAD_VERSION),-var "nomad_version=$(NOMAD_VERSION)") \
+		$(if $(VAULT_VERSION),-var "vault_version=$(VAULT_VERSION)") \
+		$(if $(PACKER_NETWORK_NAME),-var "network_name=$(PACKER_NETWORK_NAME)") \
+		$(if $(PACKER_SUBNET_NAME),-var "subnet_name=$(PACKER_SUBNET_NAME)") \
 		-var "prefix=$(PREFIX)" \
 		-var "aws_region=$(AWS_REGION)" \
 		-var "aws_profile=$(AWS_PROFILE)" \
-		-var "vpc_id=$(PACKER_VPC_ID)" \
-		-var "subnet_id=$(PACKER_SUBNET_ID)" .
+		.
 
 format:
 	packer fmt .
diff --git a/iac/provider-gcp/nomad-cluster-disk-image/Makefile b/iac/provider-gcp/nomad-cluster-disk-image/Makefile
index 3eb7a65d02..8ab93dc2bd 100644
--- a/iac/provider-gcp/nomad-cluster-disk-image/Makefile
+++ b/iac/provider-gcp/nomad-cluster-disk-image/Makefile
@@ -15,7 +15,15 @@ init:
 build:
 	terraform init -input=false -reconfigure -backend-config="bucket=${TERRAFORM_STATE_BUCKET}"
 	$(tf_vars) terraform apply -auto-approve -input=false -compact-warnings
-	packer build -var "gcp_project_id=$(GCP_PROJECT_ID)" -var "gcp_zone=$(GCP_ZONE)" -var "network_name=$(PACKER_NETWORK_NAME)" -var "subnet_name=$(PACKER_SUBNET_NAME)" .
+	packer build \
+	  	$(if $(CONSUL_VERSION),-var "consul_version=$(CONSUL_VERSION)") \
+		$(if $(NOMAD_VERSION),-var "nomad_version=$(NOMAD_VERSION)") \
+		$(if $(VAULT_VERSION),-var "vault_version=$(VAULT_VERSION)") \
+		$(if $(PACKER_NETWORK_NAME),-var "network_name=$(PACKER_NETWORK_NAME)") \
+		$(if $(PACKER_SUBNET_NAME),-var "subnet_name=$(PACKER_SUBNET_NAME)") \
+		-var "gcp_project_id=$(GCP_PROJECT_ID)" \
+		-var "gcp_zone=$(GCP_ZONE)" \
+		.
 
 format:
 	packer fmt .

From 745c77f66443db36982c72b6022fda1a9e9e6607 Mon Sep 17 00:00:00 2001
From: Joe Lombrozo <joe.lombrozo@e2b.dev>
Date: Sat, 30 May 2026 01:38:08 -0400
Subject: [PATCH 3/9] remove vault (we removed this?)

---
 iac/provider-aws/nomad-cluster-disk-image/Makefile | 1 -
 iac/provider-gcp/nomad-cluster-disk-image/Makefile | 1 -
 2 files changed, 2 deletions(-)

diff --git a/iac/provider-aws/nomad-cluster-disk-image/Makefile b/iac/provider-aws/nomad-cluster-disk-image/Makefile
index 65d466628f..b19f32d70f 100644
--- a/iac/provider-aws/nomad-cluster-disk-image/Makefile
+++ b/iac/provider-aws/nomad-cluster-disk-image/Makefile
@@ -8,7 +8,6 @@ build:
 	packer build \
 		$(if $(CONSUL_VERSION),-var "consul_version=$(CONSUL_VERSION)") \
 		$(if $(NOMAD_VERSION),-var "nomad_version=$(NOMAD_VERSION)") \
-		$(if $(VAULT_VERSION),-var "vault_version=$(VAULT_VERSION)") \
 		$(if $(PACKER_NETWORK_NAME),-var "network_name=$(PACKER_NETWORK_NAME)") \
 		$(if $(PACKER_SUBNET_NAME),-var "subnet_name=$(PACKER_SUBNET_NAME)") \
 		-var "prefix=$(PREFIX)" \
diff --git a/iac/provider-gcp/nomad-cluster-disk-image/Makefile b/iac/provider-gcp/nomad-cluster-disk-image/Makefile
index 8ab93dc2bd..a311f0b44a 100644
--- a/iac/provider-gcp/nomad-cluster-disk-image/Makefile
+++ b/iac/provider-gcp/nomad-cluster-disk-image/Makefile
@@ -18,7 +18,6 @@ build:
 	packer build \
 	  	$(if $(CONSUL_VERSION),-var "consul_version=$(CONSUL_VERSION)") \
 		$(if $(NOMAD_VERSION),-var "nomad_version=$(NOMAD_VERSION)") \
-		$(if $(VAULT_VERSION),-var "vault_version=$(VAULT_VERSION)") \
 		$(if $(PACKER_NETWORK_NAME),-var "network_name=$(PACKER_NETWORK_NAME)") \
 		$(if $(PACKER_SUBNET_NAME),-var "subnet_name=$(PACKER_SUBNET_NAME)") \
 		-var "gcp_project_id=$(GCP_PROJECT_ID)" \

From 70ecd4aa654908c08877061ac099b52d9198904e Mon Sep 17 00:00:00 2001
From: Joe Lombrozo <joe.lombrozo@e2b.dev>
Date: Sat, 30 May 2026 01:48:05 -0400
Subject: [PATCH 4/9] set up gcp to override like aws

---
 iac/provider-gcp/nomad-cluster-disk-image/Makefile          | 1 +
 iac/provider-gcp/nomad-cluster-disk-image/main.pkr.hcl      | 2 +-
 iac/provider-gcp/nomad-cluster-disk-image/variables.pkr.hcl | 5 +++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/iac/provider-gcp/nomad-cluster-disk-image/Makefile b/iac/provider-gcp/nomad-cluster-disk-image/Makefile
index a311f0b44a..ca7ce7885b 100644
--- a/iac/provider-gcp/nomad-cluster-disk-image/Makefile
+++ b/iac/provider-gcp/nomad-cluster-disk-image/Makefile
@@ -20,6 +20,7 @@ build:
 		$(if $(NOMAD_VERSION),-var "nomad_version=$(NOMAD_VERSION)") \
 		$(if $(PACKER_NETWORK_NAME),-var "network_name=$(PACKER_NETWORK_NAME)") \
 		$(if $(PACKER_SUBNET_NAME),-var "subnet_name=$(PACKER_SUBNET_NAME)") \
+		$(if $(SOURCE_NAME),-var "source_name=$(SOURCE_NAME)") \
 		-var "gcp_project_id=$(GCP_PROJECT_ID)" \
 		-var "gcp_zone=$(GCP_ZONE)" \
 		.
diff --git a/iac/provider-gcp/nomad-cluster-disk-image/main.pkr.hcl b/iac/provider-gcp/nomad-cluster-disk-image/main.pkr.hcl
index 2a0c3df6f1..36c3f7a439 100644
--- a/iac/provider-gcp/nomad-cluster-disk-image/main.pkr.hcl
+++ b/iac/provider-gcp/nomad-cluster-disk-image/main.pkr.hcl
@@ -14,7 +14,7 @@ source "googlecompute" "orch" {
   # TODO: Overwrite the image instead of creating timestamped images every time we build its
   image_name    = "${var.prefix}orch-${formatdate("YYYY-MM-DD-hh-mm-ss", timestamp())}"
   project_id    = var.gcp_project_id
-  source_image  = "ubuntu-2404-noble-amd64-v20260517"
+  source_image  = var.source_image
   ssh_username  = "ubuntu"
   zone          = var.gcp_zone
   disk_size     = 10
diff --git a/iac/provider-gcp/nomad-cluster-disk-image/variables.pkr.hcl b/iac/provider-gcp/nomad-cluster-disk-image/variables.pkr.hcl
index 9c22b4e459..1979d52718 100644
--- a/iac/provider-gcp/nomad-cluster-disk-image/variables.pkr.hcl
+++ b/iac/provider-gcp/nomad-cluster-disk-image/variables.pkr.hcl
@@ -39,3 +39,8 @@ variable "cni_plugin_version" {
   type    = string
   default = "v1.6.2"
 }
+
+variable "source_image" {
+  type    = string
+  default = "ubuntu-2404-noble-amd64-v20260517"
+}

From 3d24fab1feb76f9604f5f55727e15521e3303e9c Mon Sep 17 00:00:00 2001
From: Joe Lombrozo <joe.lombrozo@e2b.dev>
Date: Sat, 30 May 2026 01:49:35 -0400
Subject: [PATCH 5/9] allow filtername to be overridden

---
 iac/provider-aws/nomad-cluster-disk-image/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/iac/provider-aws/nomad-cluster-disk-image/Makefile b/iac/provider-aws/nomad-cluster-disk-image/Makefile
index b19f32d70f..4f2e7e6394 100644
--- a/iac/provider-aws/nomad-cluster-disk-image/Makefile
+++ b/iac/provider-aws/nomad-cluster-disk-image/Makefile
@@ -10,6 +10,7 @@ build:
 		$(if $(NOMAD_VERSION),-var "nomad_version=$(NOMAD_VERSION)") \
 		$(if $(PACKER_NETWORK_NAME),-var "network_name=$(PACKER_NETWORK_NAME)") \
 		$(if $(PACKER_SUBNET_NAME),-var "subnet_name=$(PACKER_SUBNET_NAME)") \
+		$(if $(SOURCE_AMI_FILTER_NAME),-var "source_ami_filter_name=$(SOURCE_AMI_FILTER_NAME)") \
 		-var "prefix=$(PREFIX)" \
 		-var "aws_region=$(AWS_REGION)" \
 		-var "aws_profile=$(AWS_PROFILE)" \

From 81505f16909be253f9cb824825006786317e4b44 Mon Sep 17 00:00:00 2001
From: Joe Lombrozo <joe.lombrozo@e2b.dev>
Date: Sat, 30 May 2026 01:52:00 -0400
Subject: [PATCH 6/9] go back to the old vars

---
 iac/provider-aws/nomad-cluster-disk-image/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/iac/provider-aws/nomad-cluster-disk-image/Makefile b/iac/provider-aws/nomad-cluster-disk-image/Makefile
index 4f2e7e6394..9845134b67 100644
--- a/iac/provider-aws/nomad-cluster-disk-image/Makefile
+++ b/iac/provider-aws/nomad-cluster-disk-image/Makefile
@@ -8,8 +8,8 @@ build:
 	packer build \
 		$(if $(CONSUL_VERSION),-var "consul_version=$(CONSUL_VERSION)") \
 		$(if $(NOMAD_VERSION),-var "nomad_version=$(NOMAD_VERSION)") \
-		$(if $(PACKER_NETWORK_NAME),-var "network_name=$(PACKER_NETWORK_NAME)") \
-		$(if $(PACKER_SUBNET_NAME),-var "subnet_name=$(PACKER_SUBNET_NAME)") \
+		$(if $(PACKER_VPC_ID),-var "vpc_id=$(PACKER_VPC_ID)") \
+		$(if $(PACKER_SUBNET_ID),-var "subnet_id=$(PACKER_SUBNET_ID)") \
 		$(if $(SOURCE_AMI_FILTER_NAME),-var "source_ami_filter_name=$(SOURCE_AMI_FILTER_NAME)") \
 		-var "prefix=$(PREFIX)" \
 		-var "aws_region=$(AWS_REGION)" \

From bc1bf84a81990dced53be05532110227336fbd17 Mon Sep 17 00:00:00 2001
From: Joe Lombrozo <joe.lombrozo@e2b.dev>
Date: Sat, 30 May 2026 01:53:19 -0400
Subject: [PATCH 7/9] oops, this is the right flag

---
 iac/nomad-cluster-disk-image/setup/install-consul.sh | 2 +-
 iac/nomad-cluster-disk-image/setup/install-nomad.sh  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/iac/nomad-cluster-disk-image/setup/install-consul.sh b/iac/nomad-cluster-disk-image/setup/install-consul.sh
index 5a2eb82d09..dd7e7de3a1 100644
--- a/iac/nomad-cluster-disk-image/setup/install-consul.sh
+++ b/iac/nomad-cluster-disk-image/setup/install-consul.sh
@@ -123,7 +123,7 @@ function install_binary {
   local -r bin_dir="$install_path/bin"
   local -r consul_dest_path="$bin_dir/consul"
 
-  unzip -n -d /tmp "$DOWNLOAD_PACKAGE_PATH"
+  unzip -o -d /tmp "$DOWNLOAD_PACKAGE_PATH"
 
   log_info "Moving Consul binary to $consul_dest_path"
   sudo mv "/tmp/consul" "$consul_dest_path"
diff --git a/iac/nomad-cluster-disk-image/setup/install-nomad.sh b/iac/nomad-cluster-disk-image/setup/install-nomad.sh
index 75dec84b75..b8bf550864 100755
--- a/iac/nomad-cluster-disk-image/setup/install-nomad.sh
+++ b/iac/nomad-cluster-disk-image/setup/install-nomad.sh
@@ -141,7 +141,7 @@ function install_binaries {
 
   log_info "Downloading Nomad $version from $url to $download_path"
   curl -o "$download_path" "$url"
-  unzip -n -d /tmp "$download_path"
+  unzip -o -d /tmp "$download_path"
 
   log_info "Moving Nomad binary to $nomad_dest_path"
   sudo mv "/tmp/nomad" "$nomad_dest_path"

From 275700fe6561730b370517c3af871a83da46e88e Mon Sep 17 00:00:00 2001
From: Joe Lombrozo <joe.lombrozo@e2b.dev>
Date: Sat, 30 May 2026 01:57:25 -0400
Subject: [PATCH 8/9] fix env var

---
 iac/provider-gcp/nomad-cluster-disk-image/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/iac/provider-gcp/nomad-cluster-disk-image/Makefile b/iac/provider-gcp/nomad-cluster-disk-image/Makefile
index ca7ce7885b..fa882a5367 100644
--- a/iac/provider-gcp/nomad-cluster-disk-image/Makefile
+++ b/iac/provider-gcp/nomad-cluster-disk-image/Makefile
@@ -20,7 +20,7 @@ build:
 		$(if $(NOMAD_VERSION),-var "nomad_version=$(NOMAD_VERSION)") \
 		$(if $(PACKER_NETWORK_NAME),-var "network_name=$(PACKER_NETWORK_NAME)") \
 		$(if $(PACKER_SUBNET_NAME),-var "subnet_name=$(PACKER_SUBNET_NAME)") \
-		$(if $(SOURCE_NAME),-var "source_name=$(SOURCE_NAME)") \
+		$(if $(SOURCE_IMAGE),-var "source_image=$(SOURCE_IMAGE)") \
 		-var "gcp_project_id=$(GCP_PROJECT_ID)" \
 		-var "gcp_zone=$(GCP_ZONE)" \
 		.

From 892346dd578215d7186bc34edbca61935d38fd00 Mon Sep 17 00:00:00 2001
From: Jiri Sveceny <jiri.sveceny@icloud.com>
Date: Mon, 1 Jun 2026 09:42:07 +0000
Subject: [PATCH 9/9] Unify packer envs vars naming

---
 iac/provider-aws/nomad-cluster-disk-image/Makefile | 6 +++---
 iac/provider-gcp/nomad-cluster-disk-image/Makefile | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/iac/provider-aws/nomad-cluster-disk-image/Makefile b/iac/provider-aws/nomad-cluster-disk-image/Makefile
index 9845134b67..48248140a2 100644
--- a/iac/provider-aws/nomad-cluster-disk-image/Makefile
+++ b/iac/provider-aws/nomad-cluster-disk-image/Makefile
@@ -6,11 +6,11 @@ init:
 
 build:
 	packer build \
-		$(if $(CONSUL_VERSION),-var "consul_version=$(CONSUL_VERSION)") \
-		$(if $(NOMAD_VERSION),-var "nomad_version=$(NOMAD_VERSION)") \
+		$(if $(PACKER_CONSUL_VERSION),-var "consul_version=$(PACKER_CONSUL_VERSION)") \
+		$(if $(PACKER_NOMAD_VERSION),-var "nomad_version=$(PACKER_NOMAD_VERSION)") \
 		$(if $(PACKER_VPC_ID),-var "vpc_id=$(PACKER_VPC_ID)") \
 		$(if $(PACKER_SUBNET_ID),-var "subnet_id=$(PACKER_SUBNET_ID)") \
-		$(if $(SOURCE_AMI_FILTER_NAME),-var "source_ami_filter_name=$(SOURCE_AMI_FILTER_NAME)") \
+		$(if $(PACKER_SOURCE_AMI_FILTER_NAME),-var "source_ami_filter_name=$(PACKER_SOURCE_AMI_FILTER_NAME)") \
 		-var "prefix=$(PREFIX)" \
 		-var "aws_region=$(AWS_REGION)" \
 		-var "aws_profile=$(AWS_PROFILE)" \
diff --git a/iac/provider-gcp/nomad-cluster-disk-image/Makefile b/iac/provider-gcp/nomad-cluster-disk-image/Makefile
index fa882a5367..157565791d 100644
--- a/iac/provider-gcp/nomad-cluster-disk-image/Makefile
+++ b/iac/provider-gcp/nomad-cluster-disk-image/Makefile
@@ -16,11 +16,11 @@ build:
 	terraform init -input=false -reconfigure -backend-config="bucket=${TERRAFORM_STATE_BUCKET}"
 	$(tf_vars) terraform apply -auto-approve -input=false -compact-warnings
 	packer build \
-	  	$(if $(CONSUL_VERSION),-var "consul_version=$(CONSUL_VERSION)") \
-		$(if $(NOMAD_VERSION),-var "nomad_version=$(NOMAD_VERSION)") \
+		$(if $(PACKER_CONSUL_VERSION),-var "consul_version=$(PACKER_CONSUL_VERSION)") \
+		$(if $(PACKER_NOMAD_VERSION),-var "nomad_version=$(PACKER_NOMAD_VERSION)") \
 		$(if $(PACKER_NETWORK_NAME),-var "network_name=$(PACKER_NETWORK_NAME)") \
 		$(if $(PACKER_SUBNET_NAME),-var "subnet_name=$(PACKER_SUBNET_NAME)") \
-		$(if $(SOURCE_IMAGE),-var "source_image=$(SOURCE_IMAGE)") \
+		$(if $(PACKER_SOURCE_IMAGE),-var "source_image=$(PACKER_SOURCE_IMAGE)") \
 		-var "gcp_project_id=$(GCP_PROJECT_ID)" \
 		-var "gcp_zone=$(GCP_ZONE)" \
 		.