diff --git a/.github/workflows/ci-docker.yml b/.github/workflows/ci-docker.yml
index c91b2b05c..5793ecfa1 100644
--- a/.github/workflows/ci-docker.yml
+++ b/.github/workflows/ci-docker.yml
@@ -216,9 +216,9 @@ jobs:
           GHCR_REPO: ${{ env.REGISTRY }}/${{ needs.build-arch.outputs.repository }}
         run: |
           for tag in ${TAGS}; do
-            dockerhub_tag="${tag/${GHCR_REPO}/paperlessngx/paperless-ngx}"
+            dockerhub_tag="${tag/${GHCR_REPO}/docker.io/paperlessngx/paperless-ngx}"
             echo "Copying ${tag} to ${dockerhub_tag}"
-            docker buildx imagetools create --tag "${dockerhub_tag}" "${tag}"
+            skopeo copy --all "docker://${tag}" "docker://${dockerhub_tag}"
           done
       - name: Copy to Quay.io
         if: needs.build-arch.outputs.push-external == 'true'
@@ -229,5 +229,5 @@ jobs:
           for tag in ${TAGS}; do
             quay_tag="${tag/${GHCR_REPO}/quay.io/paperlessngx/paperless-ngx}"
             echo "Copying ${tag} to ${quay_tag}"
-            docker buildx imagetools create --tag "${quay_tag}" "${tag}"
+            skopeo copy --all "docker://${tag}" "docker://${quay_tag}"
           done
diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index 7ffc1b3f0..ab2aef4ee 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -8,7 +8,6 @@ import os
 import tempfile
 from os import PathLike
 from pathlib import Path
-from platform import machine
 from typing import Final
 from urllib.parse import urlparse
 
@@ -423,14 +422,9 @@ ASGI_APPLICATION = "paperless.asgi.application"
 STATIC_URL = os.getenv("PAPERLESS_STATIC_URL", BASE_URL + "static/")
 WHITENOISE_STATIC_PREFIX = "/static/"
 
-if machine().lower() == "aarch64":  # pragma: no cover
-    _static_backend = "django.contrib.staticfiles.storage.StaticFilesStorage"
-else:
-    _static_backend = "whitenoise.storage.CompressedStaticFilesStorage"
-
 STORAGES = {
     "staticfiles": {
-        "BACKEND": _static_backend,
+        "BACKEND": "whitenoise.storage.CompressedStaticFilesStorage",
     },
     "default": {"BACKEND": "django.core.files.storage.FileSystemStorage"},
 }