diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml
index a9dfac9..000b4bb 100644
--- a/.github/workflows/debug.yml
+++ b/.github/workflows/debug.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Upload Dev Debug APK to Artifacts
         uses: actions/upload-artifact@v3
         with:
-          name: ${GITHUB_REPOSITORY#*/}-${{ github.run_number }}-dev-debug-apk
+          name: ${{ github.event.repository.name }}-${{ github.run_number }}-dev-debug-apk
           path: |
             ${{ github.workspace }}/app/build/outputs/apk/devDebug/app-dev-debug.apk
 
@@ -29,6 +29,6 @@ jobs:
       - name: Upload Prod Debug APK to Artifacts
         uses: actions/upload-artifact@v3
         with:
-          name: ${GITHUB_REPOSITORY#*/}_${{ github.run_number }}-prod-debug-apk
+          name: ${{ github.event.repository.name }}_${{ github.run_number }}-prod-debug-apk
           path: |
             ${{ github.workspace }}/app/build/outputs/apk/prodDebug/app-prod-debug.apk
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 765bdee..e863e8f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -42,7 +42,7 @@ jobs:
       - name: Upload Release APK to Artifacts
         uses: actions/upload-artifact@v3
         with:
-          name: ${GITHUB_REPOSITORY#*/}-${{ github.run_number }}-prod-release-apk
+          name: ${{ github.event.repository.name }}-${{ github.run_number }}-prod-release-apk
           path: |
             ${{ github.workspace }}/app/build/outputs/apk/prodRelease/app-prod-release.apk
 
@@ -56,6 +56,6 @@ jobs:
       - name: Upload Release Bundle to Artifacts
         uses: actions/upload-artifact@v3
         with:
-          name: ${GITHUB_REPOSITORY#*/}-${{ github.run_number }}-prod-release-bundle
+          name: ${{ github.event.repository.name }}-${{ github.run_number }}-prod-release-bundle
           path: |
             ${{ github.workspace }}/app/build/outputs/bundle/prodRelease/app-prod-release.aab