From 2aaf0680e8ded8d753e9d18f096464ceda07d234 Mon Sep 17 00:00:00 2001
From: Anthony Volk <anth.volk@gmail.com>
Date: Tue, 3 Jun 2025 13:28:48 -0400
Subject: [PATCH 01/15] test: Try out script in PR with guaranteed failing run

---
 .github/workflows/pr.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 877ec56b4..ef83882d3 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -93,6 +93,8 @@ jobs:
           project_id: policyengine-api
       - name: Install dependencies
         run: make install
+      - name: Test deployment prevention script
+        run: ".github/request-model-versions.sh -b prod-api-v2-c4d5-metadata -us 1.1.1 -uk 1.1.1 -t 30"
       - name: Test the API
         run: make test
         env:

From ca80156ae8318795eab049b441d451ff5e52afe1 Mon Sep 17 00:00:00 2001
From: Anthony Volk <anth.volk@gmail.com>
Date: Tue, 3 Jun 2025 14:00:13 -0400
Subject: [PATCH 02/15] fix: Pass Cloud project as env var

---
 .github/workflows/pr.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index ef83882d3..e7e076e42 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -95,6 +95,8 @@ jobs:
         run: make install
       - name: Test deployment prevention script
         run: ".github/request-model-versions.sh -b prod-api-v2-c4d5-metadata -us 1.1.1 -uk 1.1.1 -t 30"
+        env:
+          GOOGLE_CLOUD_PROJECT: policyengine-api-v2
       - name: Test the API
         run: make test
         env:

From 3b7519d7ce1677f7ae417c1500293dfdcaa601c4 Mon Sep 17 00:00:00 2001
From: Anthony Volk <anth.volk@gmail.com>
Date: Tue, 3 Jun 2025 14:01:23 -0400
Subject: [PATCH 03/15] fix: Move project specification to script itself

---
 .github/request-model-versions.sh | 2 +-
 .github/workflows/pr.yml          | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/request-model-versions.sh b/.github/request-model-versions.sh
index cfd8c164c..afbf7465b 100755
--- a/.github/request-model-versions.sh
+++ b/.github/request-model-versions.sh
@@ -98,7 +98,7 @@ if ! [[ "$TIMEOUT_SECONDS" =~ ^[0-9]+$ ]] || ! [[ "$CHECK_INTERVAL" =~ ^[0-9]+$
 fi
 
 # Configuration
-PROJECT_ID="${GOOGLE_CLOUD_PROJECT:-$(gcloud config get-value project 2>/dev/null)}"
+PROJECT_ID="prod-api-v2-c4d5"
 WORKFLOW_LOCATION="${WORKFLOW_LOCATION:-us-central1}"
 WORKFLOW_NAME="wait-for-country-packages"
 
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index e7e076e42..ef83882d3 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -95,8 +95,6 @@ jobs:
         run: make install
       - name: Test deployment prevention script
         run: ".github/request-model-versions.sh -b prod-api-v2-c4d5-metadata -us 1.1.1 -uk 1.1.1 -t 30"
-        env:
-          GOOGLE_CLOUD_PROJECT: policyengine-api-v2
       - name: Test the API
         run: make test
         env:

From 3c46841791032521b0574fab00f3ef99580672eb Mon Sep 17 00:00:00 2001
From: Anthony Volk <anth.volk@gmail.com>
Date: Tue, 3 Jun 2025 14:13:44 -0400
Subject: [PATCH 04/15] fix: Pass project ID into workflow

---
 .github/request-model-versions.sh | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/.github/request-model-versions.sh b/.github/request-model-versions.sh
index afbf7465b..3b70b4b1d 100755
--- a/.github/request-model-versions.sh
+++ b/.github/request-model-versions.sh
@@ -99,14 +99,9 @@ fi
 
 # Configuration
 PROJECT_ID="prod-api-v2-c4d5"
-WORKFLOW_LOCATION="${WORKFLOW_LOCATION:-us-central1}"
+WORKFLOW_LOCATION="us-central1"
 WORKFLOW_NAME="wait-for-country-packages"
 
-if [ -z "$PROJECT_ID" ]; then
-    echo "Error: Could not determine project ID. Set GOOGLE_CLOUD_PROJECT environment variable."
-    exit 1
-fi
-
 echo "Starting workflow execution..."
 echo "Project: $PROJECT_ID"
 echo "Location: $WORKFLOW_LOCATION"
@@ -134,6 +129,7 @@ echo "Input: $INPUT_JSON"
 # Execute workflow
 echo "Executing workflow..."
 EXECUTION_RESULT=$(gcloud workflows execute "$WORKFLOW_NAME" \
+    --project="$PROJECT_ID" \
     --location="$WORKFLOW_LOCATION" \
     --data="$INPUT_JSON" \
     --format="json")

From 81ba34e8b6358898c0143b2d5bfa9384bc5ac531 Mon Sep 17 00:00:00 2001
From: Anthony Volk <anth.volk@gmail.com>
Date: Tue, 3 Jun 2025 16:55:05 -0400
Subject: [PATCH 05/15] fix: Install jq before running

---
 .github/request-model-versions.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/request-model-versions.sh b/.github/request-model-versions.sh
index 3b70b4b1d..993b3a8d2 100755
--- a/.github/request-model-versions.sh
+++ b/.github/request-model-versions.sh
@@ -2,6 +2,10 @@
 
 set -e
 
+# Install jq
+sudo apt-get update
+sudo apt-get install -y jq
+
 # Google Cloud Workflow execution script
 # Usage: ./wait_for_country_versions.sh -b <bucket_name> -us <us_version> -uk <uk_version> [-t timeout] [-i interval]
 

From 3464a7f89897d31431fc97bd0481c7db56bd193f Mon Sep 17 00:00:00 2001
From: Anthony Volk <anth.volk@gmail.com>
Date: Tue, 3 Jun 2025 17:09:29 -0400
Subject: [PATCH 06/15] fix: sudo not installed

---
 .github/request-model-versions.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/request-model-versions.sh b/.github/request-model-versions.sh
index 993b3a8d2..f766443f7 100755
--- a/.github/request-model-versions.sh
+++ b/.github/request-model-versions.sh
@@ -3,8 +3,8 @@
 set -e
 
 # Install jq
-sudo apt-get update
-sudo apt-get install -y jq
+apt-get update
+apt-get install -y jq
 
 # Google Cloud Workflow execution script
 # Usage: ./wait_for_country_versions.sh -b <bucket_name> -us <us_version> -uk <uk_version> [-t timeout] [-i interval]

From 1136b6618633e55f7aa2308ff9314179aba2b457 Mon Sep 17 00:00:00 2001
From: Anthony Volk <anth.volk@gmail.com>
Date: Tue, 3 Jun 2025 17:23:55 -0400
Subject: [PATCH 07/15] fix: Update versions to test successful setup

---
 .github/workflows/pr.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index ef83882d3..22c4f4598 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -94,7 +94,7 @@ jobs:
       - name: Install dependencies
         run: make install
       - name: Test deployment prevention script
-        run: ".github/request-model-versions.sh -b prod-api-v2-c4d5-metadata -us 1.1.1 -uk 1.1.1 -t 30"
+        run: ".github/request-model-versions.sh -b prod-api-v2-c4d5-metadata -us 1.302.0 -uk 1.28.2 -t 30"
       - name: Test the API
         run: make test
         env:

From 58c8328c97890e1d4ac74b15e87edb40119aa29c Mon Sep 17 00:00:00 2001
From: Anthony Volk <anth.volk@gmail.com>
Date: Tue, 3 Jun 2025 17:49:06 -0400
Subject: [PATCH 08/15] fix: Correct UK version number

---
 .github/workflows/pr.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 22c4f4598..53e385689 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -94,7 +94,7 @@ jobs:
       - name: Install dependencies
         run: make install
       - name: Test deployment prevention script
-        run: ".github/request-model-versions.sh -b prod-api-v2-c4d5-metadata -us 1.302.0 -uk 1.28.2 -t 30"
+        run: ".github/request-model-versions.sh -b prod-api-v2-c4d5-metadata -us 1.302.0 -uk 2.28.2 -t 30"
       - name: Test the API
         run: make test
         env:

From f38bf211202cd14df43b23d0ebeb0363cc63cab6 Mon Sep 17 00:00:00 2001
From: Anthony Volk <anth.volk@gmail.com>
Date: Tue, 3 Jun 2025 18:32:14 -0400
Subject: [PATCH 09/15] fix: Extract API versions when running

---
 .github/find-api-model-versions.py            | 30 +++++++++++++++++++
 ...h => request-simulation-model-versions.sh} |  0
 .github/workflows/pr.yml                      |  4 ++-
 3 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 .github/find-api-model-versions.py
 rename .github/{request-model-versions.sh => request-simulation-model-versions.sh} (100%)

diff --git a/.github/find-api-model-versions.py b/.github/find-api-model-versions.py
new file mode 100644
index 000000000..9df1e3f0c
--- /dev/null
+++ b/.github/find-api-model-versions.py
@@ -0,0 +1,30 @@
+import os
+import sys
+from policyengine_api import COUNTRY_PACKAGE_VERSIONS
+
+def find_api_model_versions_and_output_to_github():
+    """
+    Find the API model versions and output them to a file for GitHub.
+    """
+    # Try to get package versions for US and UK
+    us_version = COUNTRY_PACKAGE_VERSIONS.get('us')
+    uk_version = COUNTRY_PACKAGE_VERSIONS.get('uk')
+
+    if not us_version:
+        print("Error: US package version not found.", file=sys.stderr)
+        sys.exit(1)
+
+    if not uk_version:
+        print("Error: UK package version not found.", file=sys.stderr)
+        sys.exit(1)
+
+
+    # Write to GitHub Actions environment
+    with open(os.environ['GITHUB_ENV'], 'a') as f:
+        f.write(f'US_VERSION={us_version}\n')
+        f.write(f'UK_VERSION={uk_version}\n')
+
+if __name__ == "__main__":
+    find_api_model_versions_and_output_to_github()
+    print("API model versions found and written to GitHub environment.")
+    sys.exit(0)
\ No newline at end of file
diff --git a/.github/request-model-versions.sh b/.github/request-simulation-model-versions.sh
similarity index 100%
rename from .github/request-model-versions.sh
rename to .github/request-simulation-model-versions.sh
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 53e385689..def4192d4 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -93,8 +93,10 @@ jobs:
           project_id: policyengine-api
       - name: Install dependencies
         run: make install
+      - name: Find API model versions
+        run: python3 .github/find-api-model-versions.py
       - name: Test deployment prevention script
-        run: ".github/request-model-versions.sh -b prod-api-v2-c4d5-metadata -us 1.302.0 -uk 2.28.2 -t 30"
+        run: ".github/request-simulation-model-versions.sh -b prod-api-v2-c4d5-metadata -us ${{ $US_VERSION }} -uk 2.28.2 -t 30"
       - name: Test the API
         run: make test
         env:

From d5232151797d83e2a154b3d093ba9bc6fe29c79b Mon Sep 17 00:00:00 2001
From: Anthony Volk <anth.volk@gmail.com>
Date: Tue, 3 Jun 2025 18:34:23 -0400
Subject: [PATCH 10/15] fix: Properly reference env var

---
 .github/workflows/pr.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index def4192d4..657ced501 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -96,7 +96,7 @@ jobs:
       - name: Find API model versions
         run: python3 .github/find-api-model-versions.py
       - name: Test deployment prevention script
-        run: ".github/request-simulation-model-versions.sh -b prod-api-v2-c4d5-metadata -us ${{ $US_VERSION }} -uk 2.28.2 -t 30"
+        run: ".github/request-simulation-model-versions.sh -b prod-api-v2-c4d5-metadata -us ${{ env.US_VERSION }} -uk 2.28.2 -t 30"
       - name: Test the API
         run: make test
         env:

From 157b425f4c6c37d68cd0880b7b09255ed22768c5 Mon Sep 17 00:00:00 2001
From: Anthony Volk <anth.volk@gmail.com>
Date: Tue, 3 Jun 2025 18:46:13 -0400
Subject: [PATCH 11/15] fix: Properly import country package versions

---
 .github/find-api-model-versions.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/find-api-model-versions.py b/.github/find-api-model-versions.py
index 9df1e3f0c..15ac25c08 100644
--- a/.github/find-api-model-versions.py
+++ b/.github/find-api-model-versions.py
@@ -1,6 +1,6 @@
 import os
 import sys
-from policyengine_api import COUNTRY_PACKAGE_VERSIONS
+from policyengine_api.constants import COUNTRY_PACKAGE_VERSIONS
 
 def find_api_model_versions_and_output_to_github():
     """

From ba5c9ce65b2d6762681363182402d18c51ca3c16 Mon Sep 17 00:00:00 2001
From: Anthony Volk <anth.volk@gmail.com>
Date: Tue, 3 Jun 2025 19:00:53 -0400
Subject: [PATCH 12/15] fix: Clean up

---
 .github/request-simulation-model-versions.sh | 21 ++++++--------------
 .github/workflows/pr.yml                     |  4 ++--
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/.github/request-simulation-model-versions.sh b/.github/request-simulation-model-versions.sh
index f766443f7..bd19521aa 100755
--- a/.github/request-simulation-model-versions.sh
+++ b/.github/request-simulation-model-versions.sh
@@ -10,10 +10,9 @@ apt-get install -y jq
 # Usage: ./wait_for_country_versions.sh -b <bucket_name> -us <us_version> -uk <uk_version> [-t timeout] [-i interval]
 
 usage() {
-    echo "Usage: $0 -b <bucket_name> -us <us_version> -uk <uk_version> [-t timeout] [-i interval]"
+    echo "Usage: $0 -us <us_version> -uk <uk_version> [-t timeout] [-i interval]"
     echo ""
     echo "Required flags:"
-    echo "  -b  bucket_name      - GCS bucket name"
     echo "  -us  us_version       - US package version"
     echo "  -uk  uk_version       - UK package version"
     echo ""
@@ -23,13 +22,12 @@ usage() {
     echo "  -h  help            - Show this help message"
     echo ""
     echo "Example:"
-    echo "  $0 -b my-bucket -us v1.2.3 -uk v1.2.4"
-    echo "  $0 -b my-bucket -us v1.2.3 -uk v1.2.4 -t 600 -i 15"
+    echo "  $0 -us v1.2.3 -uk v1.2.4"
+    echo "  $0 -us v1.2.3 -uk v1.2.4 -t 600 -i 15"
     exit 1
 }
 
 # Initialize variables
-BUCKET_NAME=""
 US_VERSION=""
 UK_VERSION=""
 TIMEOUT_SECONDS="300"
@@ -38,14 +36,6 @@ CHECK_INTERVAL="10"
 # Parse command line arguments
 while [ $# -gt 0 ]; do
     case "$1" in
-        -b)
-            if [ -z "$2" ]; then
-                echo "Error: -b requires a bucket name"
-                exit 1
-            fi
-            BUCKET_NAME="$2"
-            shift 2
-            ;;
         -us)
             if [ -z "$2" ]; then
                 echo "Error: -us requires a US version"
@@ -89,9 +79,9 @@ while [ $# -gt 0 ]; do
 done
 
 # Validate required arguments
-if [ -z "$BUCKET_NAME" ] || [ -z "$US_VERSION" ] || [ -z "$UK_VERSION" ]; then
+if [ -z "$US_VERSION" ] || [ -z "$UK_VERSION" ]; then
     echo "Error: Missing required arguments"
-    echo "bucket_name (-b), us_version (-us), and uk_version (-uk) are required"
+    echo "us_version (-us) and uk_version (-uk) are required"
     usage
 fi
 
@@ -105,6 +95,7 @@ fi
 PROJECT_ID="prod-api-v2-c4d5"
 WORKFLOW_LOCATION="us-central1"
 WORKFLOW_NAME="wait-for-country-packages"
+BUCKET_NAME="prod-api-v2-c4d5-metadata"
 
 echo "Starting workflow execution..."
 echo "Project: $PROJECT_ID"
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 657ced501..866c1561f 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -93,10 +93,10 @@ jobs:
           project_id: policyengine-api
       - name: Install dependencies
         run: make install
-      - name: Find API model versions
+      - name: Find API model versions and write to environment variable
         run: python3 .github/find-api-model-versions.py
       - name: Test deployment prevention script
-        run: ".github/request-simulation-model-versions.sh -b prod-api-v2-c4d5-metadata -us ${{ env.US_VERSION }} -uk 2.28.2 -t 30"
+        run: ".github/request-simulation-model-versions.sh -us ${{ env.US_VERSION }} -uk ${{ env.UK_VERSION }} -t 30"
       - name: Test the API
         run: make test
         env:

From f8235b90cedb7cb46cab667744fd2d85482b3ce8 Mon Sep 17 00:00:00 2001
From: Anthony Volk <anth.volk@gmail.com>
Date: Tue, 3 Jun 2025 19:17:05 -0400
Subject: [PATCH 13/15] fix: Move code to push.yaml, remove from pr.yaml

---
 .github/find-api-model-versions.py | 15 ++++++++-------
 .github/workflows/pr.yml           |  4 ----
 .github/workflows/push.yml         |  6 ++++++
 changelog_entry.yaml               |  4 ++++
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/.github/find-api-model-versions.py b/.github/find-api-model-versions.py
index 15ac25c08..0c0f53fcc 100644
--- a/.github/find-api-model-versions.py
+++ b/.github/find-api-model-versions.py
@@ -2,13 +2,14 @@
 import sys
 from policyengine_api.constants import COUNTRY_PACKAGE_VERSIONS
 
+
 def find_api_model_versions_and_output_to_github():
     """
     Find the API model versions and output them to a file for GitHub.
     """
     # Try to get package versions for US and UK
-    us_version = COUNTRY_PACKAGE_VERSIONS.get('us')
-    uk_version = COUNTRY_PACKAGE_VERSIONS.get('uk')
+    us_version = COUNTRY_PACKAGE_VERSIONS.get("us")
+    uk_version = COUNTRY_PACKAGE_VERSIONS.get("uk")
 
     if not us_version:
         print("Error: US package version not found.", file=sys.stderr)
@@ -18,13 +19,13 @@ def find_api_model_versions_and_output_to_github():
         print("Error: UK package version not found.", file=sys.stderr)
         sys.exit(1)
 
-
     # Write to GitHub Actions environment
-    with open(os.environ['GITHUB_ENV'], 'a') as f:
-        f.write(f'US_VERSION={us_version}\n')
-        f.write(f'UK_VERSION={uk_version}\n')
+    with open(os.environ["GITHUB_ENV"], "a") as f:
+        f.write(f"US_VERSION={us_version}\n")
+        f.write(f"UK_VERSION={uk_version}\n")
+
 
 if __name__ == "__main__":
     find_api_model_versions_and_output_to_github()
     print("API model versions found and written to GitHub environment.")
-    sys.exit(0)
\ No newline at end of file
+    sys.exit(0)
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 866c1561f..877ec56b4 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -93,10 +93,6 @@ jobs:
           project_id: policyengine-api
       - name: Install dependencies
         run: make install
-      - name: Find API model versions and write to environment variable
-        run: python3 .github/find-api-model-versions.py
-      - name: Test deployment prevention script
-        run: ".github/request-simulation-model-versions.sh -us ${{ env.US_VERSION }} -uk ${{ env.UK_VERSION }} -t 30"
       - name: Test the API
         run: make test
         env:
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 4b89edcd0..c3de040a8 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -65,6 +65,12 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: "3.11"
+      - name: Install dependencies (required for finding API model versions)
+        run: make install
+      - name: Find API model versions and write to environment variable
+        run: python3 .github/find-api-model-versions.py
+      - name: Ensure full API and simulation API model versions are in sync
+        run: ".github/request-simulation-model-versions.sh -us ${{ env.US_VERSION }} -uk ${{ env.UK_VERSION }}"
       - name: GCP authentication
         uses: "google-github-actions/auth@v2"
         with:
diff --git a/changelog_entry.yaml b/changelog_entry.yaml
index e69de29bb..e35b15ed4 100644
--- a/changelog_entry.yaml
+++ b/changelog_entry.yaml
@@ -0,0 +1,4 @@
+- bump: minor
+  changes:
+    added:
+    - GitHub Actions checks that full API and simulation API model versions are in sync
\ No newline at end of file

From 6f8804e61fc9e9fa650c2f5137712aa05814b424 Mon Sep 17 00:00:00 2001
From: Anthony Volk <anth.volk@gmail.com>
Date: Tue, 3 Jun 2025 19:19:37 -0400
Subject: [PATCH 14/15] fix: Fix comments

---
 .github/request-simulation-model-versions.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/request-simulation-model-versions.sh b/.github/request-simulation-model-versions.sh
index bd19521aa..bebb35e2b 100755
--- a/.github/request-simulation-model-versions.sh
+++ b/.github/request-simulation-model-versions.sh
@@ -7,7 +7,7 @@ apt-get update
 apt-get install -y jq
 
 # Google Cloud Workflow execution script
-# Usage: ./wait_for_country_versions.sh -b <bucket_name> -us <us_version> -uk <uk_version> [-t timeout] [-i interval]
+# Usage: ./request-simulation-model-versions.sh -us <us_version> -uk <uk_version> [-t timeout] [-i interval]
 
 usage() {
     echo "Usage: $0 -us <us_version> -uk <uk_version> [-t timeout] [-i interval]"

From 6c5d164ba1807ef3a338d4bc54dd20d4413bb285 Mon Sep 17 00:00:00 2001
From: Anthony Volk <anth.volk@gmail.com>
Date: Tue, 3 Jun 2025 20:48:36 -0400
Subject: [PATCH 15/15] fix: Respond to review

---
 .github/install-jq.sh                        |  6 +++++
 .github/request-simulation-model-versions.sh | 24 +++++++++++++-------
 .github/workflows/push.yml                   |  4 +++-
 3 files changed, 25 insertions(+), 9 deletions(-)
 create mode 100644 .github/install-jq.sh

diff --git a/.github/install-jq.sh b/.github/install-jq.sh
new file mode 100644
index 000000000..45562a138
--- /dev/null
+++ b/.github/install-jq.sh
@@ -0,0 +1,6 @@
+#! /usr/bin/env bash
+
+set -e
+
+apt-get update
+apt-get install -y jq
\ No newline at end of file
diff --git a/.github/request-simulation-model-versions.sh b/.github/request-simulation-model-versions.sh
index bebb35e2b..8e563dc65 100755
--- a/.github/request-simulation-model-versions.sh
+++ b/.github/request-simulation-model-versions.sh
@@ -2,17 +2,14 @@
 
 set -e
 
-# Install jq
-apt-get update
-apt-get install -y jq
-
 # Google Cloud Workflow execution script
-# Usage: ./request-simulation-model-versions.sh -us <us_version> -uk <uk_version> [-t timeout] [-i interval]
+# Usage: ./request-simulation-model-versions.sh -b <bucket_name> -us <us_version> -uk <uk_version> [-t timeout] [-i interval]
 
 usage() {
     echo "Usage: $0 -us <us_version> -uk <uk_version> [-t timeout] [-i interval]"
     echo ""
     echo "Required flags:"
+    echo "  -b  bucket_name      - GCS bucket name"
     echo "  -us  us_version       - US package version"
     echo "  -uk  uk_version       - UK package version"
     echo ""
@@ -28,6 +25,7 @@ usage() {
 }
 
 # Initialize variables
+BUCKET_NAME=""
 US_VERSION=""
 UK_VERSION=""
 TIMEOUT_SECONDS="300"
@@ -36,6 +34,17 @@ CHECK_INTERVAL="10"
 # Parse command line arguments
 while [ $# -gt 0 ]; do
     case "$1" in
+        -h|--help)
+            usage
+            ;;
+        -b)
+            if [ -z "$2" ]; then
+                echo "Error: -b requires a bucket name"
+                exit 1
+            fi
+            BUCKET_NAME="$2"
+            shift 2
+            ;;
         -us)
             if [ -z "$2" ]; then
                 echo "Error: -us requires a US version"
@@ -79,9 +88,9 @@ while [ $# -gt 0 ]; do
 done
 
 # Validate required arguments
-if [ -z "$US_VERSION" ] || [ -z "$UK_VERSION" ]; then
+if [ -z "$BUCKET_NAME" ] || -z "$US_VERSION" ] || [ -z "$UK_VERSION" ]; then
     echo "Error: Missing required arguments"
-    echo "us_version (-us) and uk_version (-uk) are required"
+    echo "bucket_name (-b), us_version (-us), and uk_version (-uk) are required"
     usage
 fi
 
@@ -95,7 +104,6 @@ fi
 PROJECT_ID="prod-api-v2-c4d5"
 WORKFLOW_LOCATION="us-central1"
 WORKFLOW_NAME="wait-for-country-packages"
-BUCKET_NAME="prod-api-v2-c4d5-metadata"
 
 echo "Starting workflow execution..."
 echo "Project: $PROJECT_ID"
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index c3de040a8..e430f10f0 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -67,10 +67,12 @@ jobs:
           python-version: "3.11"
       - name: Install dependencies (required for finding API model versions)
         run: make install
+      - name: Install jq (required only for GitHub Actions)
+        run: ".github/install-jq.sh"
       - name: Find API model versions and write to environment variable
         run: python3 .github/find-api-model-versions.py
       - name: Ensure full API and simulation API model versions are in sync
-        run: ".github/request-simulation-model-versions.sh -us ${{ env.US_VERSION }} -uk ${{ env.UK_VERSION }}"
+        run: ".github/request-simulation-model-versions.sh -b prod-api-v2-c4d5-metadata -us ${{ env.US_VERSION }} -uk ${{ env.UK_VERSION }}"
       - name: GCP authentication
         uses: "google-github-actions/auth@v2"
         with: