diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
index a6f5760c..3fcd8a5a 100644
--- a/.github/workflows/create-release.yml
+++ b/.github/workflows/create-release.yml
@@ -110,7 +110,8 @@ jobs:
               is_new,
               stack_type,
               pattern_image_registry_name,
-              pattern_assets_prefix
+              pattern_assets_prefix,
+              no_stack_id
             })')
 
           stacks=$(jq -c <<< "$stacks" )
@@ -637,8 +638,17 @@ jobs:
     - name: Create stack ${{ matrix.stacks.name }}
       id: create-stack
       run: |
-        scripts/create.sh --stack-dir ${{ matrix.stacks.config_dir }} \
-                          --build-dir ${{ matrix.stacks.output_dir }}
+
+        args=(
+            --stack-dir ${{ matrix.stacks.config_dir }}
+            --build-dir ${{ matrix.stacks.output_dir }}
+          )
+
+        if [[ "${{ matrix.stacks.no_stack_id }}" == "true" ]]; then
+          args+=("--no-stack-id")
+        fi
+
+        scripts/create.sh "${args[@]}"
 
     - name: Generate Package Receipts
       id: receipts
diff --git a/.github/workflows/test-pull-request.yml b/.github/workflows/test-pull-request.yml
index 9b96c13b..a929ef4f 100644
--- a/.github/workflows/test-pull-request.yml
+++ b/.github/workflows/test-pull-request.yml
@@ -41,7 +41,8 @@ jobs:
               name,
               config_dir,
               output_dir,
-              create_build_image})')
+              create_build_image,
+              no_stack_id})')
 
           stacks=$(jq -c <<< "$stacks" )
           echo "stacks=$stacks"
@@ -65,8 +66,17 @@ jobs:
     - name: Create stack ${{ matrix.stacks.name }}
       id: create-stack
       run: |
-        scripts/create.sh --stack-dir ${{ matrix.stacks.config_dir }} \
-                          --build-dir ${{ matrix.stacks.output_dir }}
+        args=(
+            --stack-dir ${{ matrix.stacks.config_dir }}
+            --build-dir ${{ matrix.stacks.output_dir }}
+          )
+
+        if [[ "${{ matrix.stacks.no_stack_id }}" == "true" ]]; then
+          args+=("--no-stack-id")
+        fi
+
+        scripts/create.sh "${args[@]}"
+
 
     - name: Upload run image
       uses: actions/upload-artifact@v4
diff --git a/scripts/create.sh b/scripts/create.sh
index a25c3018..e4cd5956 100755
--- a/scripts/create.sh
+++ b/scripts/create.sh
@@ -23,6 +23,7 @@ function main() {
   local stack_dir_name build_dir_name
   stack_dir_name=""
   build_dir_name=""
+  no_stack_id="false"
 
   while [[ "${#}" != 0 ]]; do
     case "${1}" in
@@ -52,6 +53,11 @@ function main() {
         shift 2
         ;;
 
+      --no-stack-id)
+        no_stack_id="true"
+        shift 1
+        ;;
+
       "")
         # skip if the argument is empty
         shift 1
@@ -127,6 +133,10 @@ function stack::create() {
       --run-output "${build_dirpath}/run.oci"
     )
 
+  if [[ "${no_stack_id}" == "true" ]]; then
+    args+=("--no-stack-id")
+  fi
+
   args+=("${flags[@]}")
 
   jam create-stack "${args[@]}"
diff --git a/scripts/test.sh b/scripts/test.sh
index 738810fb..e4b0f147 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -118,9 +118,11 @@ function main() {
     while read -r image; do
       config_dir=$(echo "${image}" | jq -r '.config_dir')
       output_dir=$(echo "${image}" | jq -r '.output_dir')
+      no_stack_id=$(echo "${image}" | jq -r '.no_stack_id // false')
       "${ROOT_DIR}/scripts/create.sh" \
         --stack-dir "${config_dir}" \
-        --build-dir "${output_dir}"
+        --build-dir "${output_dir}" \
+        --no-stack-id "${no_stack_id}"
     done <<<"$STACK_IMAGES"
   else
     util::print::title "Stack builds already exist..."