diff --git a/.github/workflows/build_and_test.yaml b/.github/workflows/build_and_test.yaml
index e9bbc04e..7bb5f320 100644
--- a/.github/workflows/build_and_test.yaml
+++ b/.github/workflows/build_and_test.yaml
@@ -79,6 +79,11 @@ jobs:
             matrix:
                 sqlcipher: [system, static]
                 arch: [amd64, arm64]
+                exclude:
+                    # FIXME: This combination yields a broken Seshat at this time
+                    # Errors at launch with `undefined symbol: PKCS5_PBKDF2_HMAC
+                    - arch: arm64
+                      sqlcipher: static
         with:
             config: ${{ github.event.pull_request.base.ref == 'develop' && 'element.io/nightly' || 'element.io/release' }}
             sqlcipher: ${{ matrix.sqlcipher }}
diff --git a/.github/workflows/build_linux.yaml b/.github/workflows/build_linux.yaml
index 77e97c30..866e2cfb 100644
--- a/.github/workflows/build_linux.yaml
+++ b/.github/workflows/build_linux.yaml
@@ -136,8 +136,6 @@ jobs:
                   yarn build --publish never -l --config electron-builder.json ${{ steps.config.outputs.build-args }}
 
             - name: Check native libraries
-              # XXX: remove this later
-              # continue-on-error: ${{ inputs.arch == 'arm64' }}
               run: |
                   set -x
                   shopt -s globstar
@@ -196,8 +194,6 @@ jobs:
               working-directory: "dist/install/linux/glibc-x86-64"
 
             - name: Upload Artifacts
-              # XXX: remove this later
-              if: always()
               uses: actions/upload-artifact@v3
               with:
                   name: ${{ inputs.deploy-mode && 'packages.element.io' || format('linux-{0}-sqlcipher-{1}', inputs.arch, inputs.sqlcipher) }}