diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6dc3eb6b1..70bb4d661 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -272,9 +272,8 @@ jobs:
 
       - name: Upload Portable Artifact to GitHub
         uses: actions/upload-artifact@v2
-        continue-on-error: true
         with:
-          name: ${{ env.PKGNAME }}.zip
+          name: ${{ env.PKGNAME }}
           path: ${{ runner.workspace }}/build/olive-editor
 
   macos:
@@ -375,13 +374,13 @@ jobs:
         if: matrix.os-arch == 'x86_64' # ARM64 tests naturally won't be able to run on x86_64 runners
 
       - name: Create Package
-        working-directory: ${{ runner.workspace }}/build
+        working-directory: ${{ runner.workspace }}/build/deploy
         shell: bash
         run: |
           BUNDLE_NAME="Olive.app"
           brew install dylibbundler
 
-          mv app/$BUNDLE_NAME .
+          mv ../app/$BUNDLE_NAME .
           mkdir $BUNDLE_NAME/Contents/Frameworks
 
           # Copy Qt frameworks and plugins
@@ -403,7 +402,7 @@ jobs:
           mv Olive.sym "$SYM_DIR"
 
       - name: Sign Application
-        working-directory: ${{ runner.workspace }}/build
+        working-directory: ${{ runner.workspace }}/build/deploy
         shell: bash
         if: github.event_name == 'push'
         env:
@@ -444,4 +443,4 @@ jobs:
         continue-on-error: true
         with:
           name: ${{ env.PKGNAME }}
-          path: ${{ runner.workspace }}/build/Olive.app
+          path: ${{ runner.workspace }}/build/deploy