diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index b7592e6d5233..84df18714f37 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -22,10 +22,12 @@ jobs:
   nightly-failure:
     name: Create comment on failed test run
     if: ${{ github.repository_owner == 'Qiskit' && failure() }}
-    uses: peter-evans/create-or-update-comment@v4
-    with:
-      issue-number: 7864
-      body: |
-        Nightly matrix test run failed at commit ${{ github.sha }}.
+    runs-on: ubuntu-latest
+    steps:
+      - uses: peter-evans/create-or-update-comment@v4
+        with:
+          issue-number: 7864
+          body: |
+            Nightly matrix test run failed at commit ${{ github.sha }}.
 
-        _Logs_: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}.
+            _Logs_: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}.
diff --git a/.github/workflows/on-nightly.yml b/.github/workflows/on-nightly.yml
index a7f7166e80aa..4fdfd8105d5f 100644
--- a/.github/workflows/on-nightly.yml
+++ b/.github/workflows/on-nightly.yml
@@ -9,7 +9,7 @@ concurrency:
 
 jobs:
   nightly-linux:
-    uses: ./.github/workflows/test-linux
+    uses: ./.github/workflows/test-linux.yml
     strategy:
       matrix:
         python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
@@ -19,7 +19,7 @@ jobs:
       test-rust: false
       install-optionals: true
   nightly-mac:
-    uses: ./.github/workflows/test-mac
+    uses: ./.github/workflows/test-mac.yml
     strategy:
       matrix:
         python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
@@ -27,7 +27,7 @@ jobs:
       python-version: ${{ matrix.python-version }}
       install-optionals: true
   nightly-windows:
-    uses: ./.github/workflows/test-windows
+    uses: ./.github/workflows/test-windows.yml
     strategy:
       matrix:
         python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
diff --git a/.github/workflows/on-push.yml b/.github/workflows/on-push.yml
index 5e08d1cf5a68..0d107a40b35e 100644
--- a/.github/workflows/on-push.yml
+++ b/.github/workflows/on-push.yml
@@ -9,7 +9,7 @@ on:
 jobs:
   tests-mac:
     if: github.repository_owner == 'Qiskit'
-    uses: ./.github/workflows/test-mac
+    uses: ./.github/workflows/test-mac.yml
     strategy:
       matrix:
         python-version: ["3.9", "3.13"]
@@ -18,7 +18,7 @@ jobs:
       install-optionals: false
   test-linux:
     if: github.repository_owner == 'Qiskit'
-    uses: ./.github/workflows/test-mac
+    uses: ./.github/workflows/test-linux.yml
     with:
       python-version: "3.9"
       test-rust: true