diff --git a/.github/workflows/Android.yml b/.github/workflows/Android.yml
index dbb0d7ee6711..75eface9ebb6 100644
--- a/.github/workflows/Android.yml
+++ b/.github/workflows/Android.yml
@@ -30,7 +30,7 @@ jobs:
       id: slug
       run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
 
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@v6
       with:
         name: retroarch-android-${{ steps.slug.outputs.sha8 }}
         path: |
diff --git a/.github/workflows/DOS-DJGPP.yml b/.github/workflows/DOS-DJGPP.yml
index 84086cd6cd89..0f58431eb3ef 100644
--- a/.github/workflows/DOS-DJGPP.yml
+++ b/.github/workflows/DOS-DJGPP.yml
@@ -31,7 +31,7 @@ jobs:
       id: slug
       run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
 
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@v6
       with:
         name: RA-DOS-dummy-${{ steps.slug.outputs.sha8 }}
         path: |
diff --git a/.github/workflows/MSVC.yml b/.github/workflows/MSVC.yml
index 478205756b6d..cc7750875d8c 100644
--- a/.github/workflows/MSVC.yml
+++ b/.github/workflows/MSVC.yml
@@ -47,7 +47,7 @@ jobs:
         run: echo "sha8=$('${{github.sha}}'.Substring(0,8))"  >> $env:GITHUB_OUTPUT
         # https://github.blog/changelog/2022-10-11-github-actions-deprecating-save-state-and-set-output-commands/
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v6
         with:
           name: retroarch-${{matrix.version}}-${{matrix.configuration}}-${{matrix.platform}}-${{ steps.slug.outputs.sha8 }}
           path: |
diff --git a/.github/workflows/MSYS2.yml b/.github/workflows/MSYS2.yml
index 5b2514eee989..90ad10b19b10 100644
--- a/.github/workflows/MSYS2.yml
+++ b/.github/workflows/MSYS2.yml
@@ -71,7 +71,7 @@ jobs:
 
       - name: Archive build artifacts
         if: success()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: retroarch-${{ matrix.sys }}
           path: dist/
diff --git a/.github/workflows/MacOS.yml b/.github/workflows/MacOS.yml
index 10ab355ec3b8..538969431c97 100644
--- a/.github/workflows/MacOS.yml
+++ b/.github/workflows/MacOS.yml
@@ -26,7 +26,7 @@ jobs:
       id: slug
       run: echo "sha8=$(echo ${GITHUB_SHA} | cut -c1-8)" >> $GITHUB_OUTPUT
 
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@v6
       with:
         name: RetroArch-${{ steps.slug.outputs.sha8 }}
         path: |
diff --git a/.github/workflows/Miyoo.yml b/.github/workflows/Miyoo.yml
index 9977075dc8c3..f16ee302c04d 100644
--- a/.github/workflows/Miyoo.yml
+++ b/.github/workflows/Miyoo.yml
@@ -31,7 +31,7 @@ jobs:
       id: slug
       run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
 
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@v6
       with:
         name: retroarch_miyoo_arm32${{ steps.slug.outputs.sha8 }}
         path: |
diff --git a/.github/workflows/PS2.yml b/.github/workflows/PS2.yml
index 1d81d9daf459..5d1d0134ae0e 100644
--- a/.github/workflows/PS2.yml
+++ b/.github/workflows/PS2.yml
@@ -36,7 +36,7 @@ jobs:
       id: slug
       run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
 
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@v6
       with:
         name: RA-PS2-dummy-${{ steps.slug.outputs.sha8 }}
         path: |
diff --git a/.github/workflows/PS3-PSL1GHT.yml b/.github/workflows/PS3-PSL1GHT.yml
index 5850e5e88dec..eedb0e9b25ac 100644
--- a/.github/workflows/PS3-PSL1GHT.yml
+++ b/.github/workflows/PS3-PSL1GHT.yml
@@ -36,7 +36,7 @@ jobs:
       id: slug
       run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
 
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@v6
       with:
         name: RA-psl1ght-dummy-${{ steps.slug.outputs.sha8 }}
         path: |
diff --git a/.github/workflows/PS4-ORBIS.yml b/.github/workflows/PS4-ORBIS.yml
index d382a38bc682..fe91e4be105d 100644
--- a/.github/workflows/PS4-ORBIS.yml
+++ b/.github/workflows/PS4-ORBIS.yml
@@ -37,7 +37,7 @@ jobs:
       id: slug
       run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
 
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@v6
       with:
         name: bin-${{ steps.slug.outputs.sha8 }}
         path: |
diff --git a/.github/workflows/PSP.yml b/.github/workflows/PSP.yml
index 2ae652d0d656..37cf70dbb889 100644
--- a/.github/workflows/PSP.yml
+++ b/.github/workflows/PSP.yml
@@ -42,7 +42,7 @@ jobs:
       id: slug
       run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
 
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@v6
       with:
         name: RA-PSP-dummy-${{ steps.slug.outputs.sha8 }}
         path: |
diff --git a/.github/workflows/PSVita.yml b/.github/workflows/PSVita.yml
index 1e26200c0f0b..7105772b31ad 100644
--- a/.github/workflows/PSVita.yml
+++ b/.github/workflows/PSVita.yml
@@ -35,7 +35,7 @@ jobs:
       id: slug
       run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
 
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@v6
       with:
         name: RA-PSVita-dummy-${{ steps.slug.outputs.sha8 }}
         path: |
diff --git a/.github/workflows/RS90.yml b/.github/workflows/RS90.yml
index 8c730d959886..77e8ff92a076 100644
--- a/.github/workflows/RS90.yml
+++ b/.github/workflows/RS90.yml
@@ -31,7 +31,7 @@ jobs:
       id: slug
       run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
 
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@v6
       with:
         name: retroarch_rs90_mips32${{ steps.slug.outputs.sha8 }}
         path: |
diff --git a/.github/workflows/RetroFW.yml b/.github/workflows/RetroFW.yml
index f7ddae3678c3..7172798431cf 100644
--- a/.github/workflows/RetroFW.yml
+++ b/.github/workflows/RetroFW.yml
@@ -31,7 +31,7 @@ jobs:
       id: slug
       run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
 
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@v6
       with:
         name: retroarch_retrofw_mips32${{ steps.slug.outputs.sha8 }}
         path: |
diff --git a/.github/workflows/Switch-libnx.yml b/.github/workflows/Switch-libnx.yml
index df26e01f195d..0371aace4169 100644
--- a/.github/workflows/Switch-libnx.yml
+++ b/.github/workflows/Switch-libnx.yml
@@ -30,7 +30,7 @@ jobs:
       id: slug
       run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
 
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@v6
       with:
         name: RA-libnx-dummy-${{ steps.slug.outputs.sha8 }}
         path: |
diff --git a/.github/workflows/webOS.yml b/.github/workflows/webOS.yml
index d2eac2e0cb32..6bca85972d90 100644
--- a/.github/workflows/webOS.yml
+++ b/.github/workflows/webOS.yml
@@ -73,7 +73,7 @@ jobs:
         id: slug
         run: echo "sha8=$(echo ${GITHUB_SHA} | cut -c1-8)" >> $GITHUB_OUTPUT
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v6
         with:
           name: com.retroarch.webos_${{ steps.slug.outputs.sha8 }}_arm.ipk
           path: |