diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 377a970f05..bc3f1dd8fa 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -754,13 +754,15 @@ jobs:
     if: ${{ always() }}
     runs-on: ubuntu-22.04
     name: Final CI Results
-    needs: [tag-stable]
+    needs: [tag-stable, smoke-tests]
     steps:
       - run: |
-          result="${{ needs.tag-stable.result }}"
-          if [[ $result == "success" || $result == "skipped" ]]; then
-            exit 0
-          else
+          tagResult="${{ needs.tag-stable.result }}"
+          smokeResult="${{ needs.smoke-tests.result }}"
+          if [[ $tagResult != "success" && $tagResult != "skipped" ]]; then
+            exit 1
+          fi
+          if [[ $smokeResult != "success" && $smokeResult != "skipped" ]]; then
             exit 1
           fi
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e3aa48d963..3f683b334c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -413,12 +413,12 @@ jobs:
         run: |
           milestone_number=$(gh api \
             -H "Accept: application/vnd.github.v3+json" \
-            /repos/${{ github.repository_owner }}/${{ github.repository }}/milestones \
+            /repos/${{ github.repository }}/milestones \
             | jq --arg version ${{ inputs.nic_version }} -r \
             '.[] | select(.title == $version) | .number')
           if ! ${{ inputs.dry_run }}
             gh api --method PATCH -H "Accept: application/vnd.github.v3+json" \
-              /repos/${{ github.repository_owner }}/${{ github.repository }}/milestones/${milestone_number} \
+              /repos/${{ github.repository }}/milestones/${milestone_number} \
           else
             echo "Skipping closing Github Release milestone, DRY_RUN"
           fi
@@ -431,7 +431,7 @@ jobs:
           release_id=$(gh api \
             -H "Accept: application/vnd.github.v3+json" \
             -H "X-GitHub-Api-Version: 2022-11-28" \
-            /repos/${{ github.repository_owner }}/${{ github.repository }}/releases \
+            /repos/${{ github.repository }}/releases \
             | jq --arg version ${{ inputs.nic_version }} -r \
             '.[] | select(.name == $version) | .id')
           echo "release_id=${release_id}" >> $GITHUB_OUTPUT