diff --git a/.github/workflows/build-public-ami.yml b/.github/workflows/build-public-ami.yml
index b2f4576933ff..47f9f9162178 100644
--- a/.github/workflows/build-public-ami.yml
+++ b/.github/workflows/build-public-ami.yml
@@ -62,6 +62,7 @@ jobs:
           packer init ./.github/packer/
           ./.github/workflows/update-ami.py
         env:
-          TAG: ${{ env.TAG }}
+          SKIP_CREATE_AMI: ${{ env.PKR_VAR_skip_create_ami }}
+          TAG: ${{ env.PKR_VAR_tag }}
           PRODUCT_ID: ${{ secrets.MARKETPLACE_PRODUCT }}
           ROLE_ARN: ${{ secrets.MARKETPLACE_ROLE }}
diff --git a/.github/workflows/update-ami.py b/.github/workflows/update-ami.py
index 425f82238a19..3e091e7ba251 100755
--- a/.github/workflows/update-ami.py
+++ b/.github/workflows/update-ami.py
@@ -13,9 +13,10 @@
 # Environment Globals
 product_id = os.getenv('PRODUCT_ID')
 role_arn = os.getenv('ROLE_ARN')
-vtag = os.getenv('PKR_VAR_tag')
+vtag = os.getenv('TAG')
 tag = vtag.replace('v', '')
-skip_create_ami = os.getenv('PKR_VAR_skip_create_ami', "True")
+skip_create_ami = os.getenv('SKIP_CREATE_AMI', "True")
+os.environ["PKR_VAR_skip_create_ami"] = skip_create_ami
 
 def packer_build(packerfile):
   print("Running the packer build")