diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
index 6c3d07ac5..f61a4191e 100644
--- a/.github/workflows/flatpak.yml
+++ b/.github/workflows/flatpak.yml
@@ -36,10 +36,15 @@ jobs:
         with:
           submodules: 'recursive'
 
+      - name: 'Setup build environment'
+        id: setup
+        run: |
+          echo "::set-output name=commitHash::$(git rev-parse --short=9 HEAD)"
+
       - name: Build Flatpak Manifest
         uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@master
         with:
-          bundle: obs-studio-${{ github.sha }}.flatpak
+          bundle: obs-studio-${{ steps.setup.outputs.commitHash }}.flatpak
           manifest-path: CI/flatpak/com.obsproject.Studio.json
           cache-key: flatpak-builder-${{ github.sha }}
           mirror-screenshots-url: https://dl.flathub.org/repo/screenshots
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 131bee06a..f30ba5905 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -152,7 +152,7 @@ jobs:
             brew uninstall ${REMOVE_FORMULAS}
           fi
 
-          echo "::set-output name=commitHash::$(git rev-parse --short HEAD)"
+          echo "::set-output name=commitHash::$(git rev-parse --short=9 HEAD)"
 
       - name: 'Install dependencies'
         env:
@@ -249,7 +249,7 @@ jobs:
       - name: 'Setup build environment'
         id: setup
         run: |
-          echo "::set-output name=commitHash::$(git rev-parse --short HEAD)"
+          echo "::set-output name=commitHash::$(git rev-parse --short=9 HEAD)"
 
       - name: 'Install dependencies'
         env:
@@ -331,7 +331,7 @@ jobs:
       - name: Setup Environment
         id: setup
         run: |
-          $CommitHash = git rev-parse --short HEAD
+          $CommitHash = git rev-parse --short=9 HEAD
           Write-Output "::set-output name=commitHash::${CommitHash}"
 
       - name: 'Install dependencies'
@@ -390,14 +390,14 @@ jobs:
         if: ${{ success() && (github.event_name != 'pull_request' || env.SEEKING_TESTERS == '1') }}
         run: |
           echo "OBS_GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV
-          echo "OBS_GIT_HASH=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
+          echo "OBS_GIT_HASH=$(git rev-parse --short=9 HEAD)" >> $GITHUB_ENV
           echo "OBS_GIT_TAG=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV
 
       - name: Build Flatpak Manifest
         uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4
         if: ${{ success() && (github.event_name != 'pull_request' || env.SEEKING_TESTERS == '1') }}
         with:
-          bundle: obs-studio-flatpak-${{ github.sha }}.flatpak
+          bundle: obs-studio-flatpak-${{ env.OBS_GIT_HASH }}.flatpak
           manifest-path: CI/flatpak/com.obsproject.Studio.json
           cache-key: flatpak-builder-${{ github.sha }}
 
@@ -412,20 +412,27 @@ jobs:
       - name: 'Checkout'
         uses: actions/checkout@v3
 
+      - name: Setup Environment
+        id: setup
+        run: |
+          $CommitHash = git rev-parse --short=9 HEAD
+          Write-Output "::set-output name=commitHash::${CommitHash}"
+
       - name: 'Add msbuild to PATH'
         uses: microsoft/setup-msbuild@v1.1
 
       - name: 'Download 64-bit artifact'
         uses: actions/download-artifact@v3
         with:
-          name: 'obs-win64'
+          name: 'obs-win-x64-${{ steps.setup.outputs.commitHash }}'
 
       - name: 'Download 32-bit artifact'
         uses: actions/download-artifact@v3
         with:
-          name: 'obs-win32'
+          name: 'obs-win-x86-${{ steps.setup.outputs.commitHash }}'
 
       - name: 'Unpack Windows build artifacts'
+        id: unpack
         run: |
           if (!(Test-Path install_temp)) {
             $null = New-Item -ItemType Directory -Force -Path install_temp
@@ -436,14 +443,14 @@ jobs:
 
           CI/windows/03_package_obs.ps1 -CombinedArchs -Package
 
-          $ArtifactName = (Get-ChildItem -filter "OBS-Studio-*-Win-x64+x86.zip" -File).Name
-          Write-Output "FILE_NAME=${ArtifactName}" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
+          $ArtifactName = (Get-ChildItem -filter "OBS-Studio-*-Win-x86+x64.zip" -File).Name
+          Write-Output "::set-output name=filename::${ArtifactName}"
 
       - name: 'Upload build artifact'
         uses: actions/upload-artifact@v3
         with:
           name: 'obs-windows'
-          path: '${{ env.FILE_NAME }}'
+          path: '${{ steps.unpack.outputs.filename }}'
 
   macos_release:
     name: '03 - macOS notarized image'
@@ -464,11 +471,16 @@ jobs:
         if: env.HAVE_CODESIGN_IDENTITY == 'true'
         uses: actions/checkout@v3
 
+      - name: 'Setup build environment'
+        id: setup
+        run: |
+          echo "::set-output name=commitHash::$(git rev-parse --short=9 HEAD)"
+
       - name: 'Download artifact'
         if: env.HAVE_CODESIGN_IDENTITY == 'true'
         uses: actions/download-artifact@v3
         with:
-          name: 'obs-macos-${{ matrix.arch }}'
+          name: 'obs-macos-${{ matrix.arch }}-${{ steps.setup.outputs.commitHash }}'
 
       - name: 'Install Apple Developer Certificate'
         if: env.HAVE_CODESIGN_IDENTITY == 'true'
diff --git a/CI/freebsd/03_package_obs.sh b/CI/freebsd/03_package_obs.sh
index 351a0623a..c35238057 100644
--- a/CI/freebsd/03_package_obs.sh
+++ b/CI/freebsd/03_package_obs.sh
@@ -43,7 +43,7 @@ package-obs-standalone() {
     git fetch origin --tags
 
     GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
-    GIT_HASH=$(git rev-parse --short HEAD)
+    GIT_HASH=$(git rev-parse --short=9 HEAD)
     GIT_TAG=$(git describe --tags --abbrev=0)
 
     FILE_NAME="obs-studio-${GIT_TAG}-${GIT_HASH}-FreeBSD"
diff --git a/CI/linux/03_package_obs.sh b/CI/linux/03_package_obs.sh
index 170fba216..349076989 100755
--- a/CI/linux/03_package_obs.sh
+++ b/CI/linux/03_package_obs.sh
@@ -41,7 +41,7 @@ package-obs-standalone() {
     git fetch origin --tags
 
     GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
-    GIT_HASH=$(git rev-parse --short HEAD)
+    GIT_HASH=$(git rev-parse --short=9 HEAD)
     GIT_TAG=$(git describe --tags --abbrev=0)
 
     if [ "${BUILD_FOR_DISTRIBUTION}" ]; then
diff --git a/CI/macos/03_package_obs.sh b/CI/macos/03_package_obs.sh
index 7ee6e5f2d..4ab3f56d2 100755
--- a/CI/macos/03_package_obs.sh
+++ b/CI/macos/03_package_obs.sh
@@ -123,7 +123,7 @@ package-obs-standalone() {
     /usr/bin/git fetch origin --tags
 
     GIT_BRANCH=$(/usr/bin/git rev-parse --abbrev-ref HEAD)
-    GIT_HASH=$(/usr/bin/git rev-parse --short HEAD)
+    GIT_HASH=$(/usr/bin/git rev-parse --short=9 HEAD)
     GIT_TAG=$(/usr/bin/git describe --tags --abbrev=0)
 
     if [ "${BUILD_FOR_DISTRIBUTION}" ]; then
diff --git a/CI/windows/03_package_obs.ps1 b/CI/windows/03_package_obs.ps1
index c5620b404..7c030b116 100644
--- a/CI/windows/03_package_obs.ps1
+++ b/CI/windows/03_package_obs.ps1
@@ -112,7 +112,7 @@ function Package-OBS-Standalone {
 
     Ensure-Directory ${CheckoutDir}
     $GitBranch = git rev-parse --abbrev-ref HEAD
-    $GitHash = git rev-parse --short HEAD
+    $GitHash = git rev-parse --short=9 HEAD
     $ErrorActionPreference = "SilentlyContinue"
     $GitTag = git describe --tags --abbrev=0
     $ErrorActionPreference = "Stop"