diff --git a/build/branch-create/repo.txt b/build/branch-create/repo.txt
index 8d8db8d4..db0f907b 100755
--- a/build/branch-create/repo.txt
+++ b/build/branch-create/repo.txt
@@ -7,4 +7,5 @@ stolostron/governance-policy-framework-addon
 stolostron/governance-policy-propagator
 stolostron/policy-generator-plugin
 stolostron/must-gather
+stolostron/policy-cli
 stolostron/acm-cli
diff --git a/build/branch-create/update-release.sh b/build/branch-create/update-release.sh
index a33b4f61..3aa3fc6f 100755
--- a/build/branch-create/update-release.sh
+++ b/build/branch-create/update-release.sh
@@ -119,13 +119,14 @@ for dirpath in ${COMPONENT_LIST}; do
       yq e '.promotion.to[0].disabled=true' -i ${NEW_FILENAME}
       # - For the 'main' branch:
       ver="${NEW_VERSION}" yq e '.promotion.to[0].name=strenv(ver)' -i ${FILE_PREFIX}-main.yaml
-      ver="${NEW_VERSION}" \
-        yq e '.tests[] |= select(.as=="git-fast-forward").steps.env.DESTINATION_BRANCH = "release-"+strenv(ver)' -i ${FILE_PREFIX}-main.yaml
-
       # - For the old version, re-enable promotion:
       yq e 'del(.promotion.to[0].disabled)' -i ${OLD_FILENAME}
     fi
 
+    # Update fast-forwarding on the main branch
+    ver="${NEW_VERSION}" \
+      yq e '.tests[] |= select(.as=="git-fast-forward").steps.env.DESTINATION_BRANCH = "release-"+strenv(ver)' -i ${FILE_PREFIX}-main.yaml
+
     # Update the 'latest-image-mirror' tests item
     ver="${NEW_VERSION}" yq e '.tests[] |= select(.as=="latest-image-mirror").steps.env.IMAGE_TAG="latest-"+env(ver)' -i ${NEW_FILENAME}