diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 335ec15a09e0e55402b2445a356d845dc21e8392..48c2095cb5973b20efdabc1bc3f12d3e45f8758f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,7 @@ test docker:
     - docker buildx build
       --push
       --no-cache
-      --platform linux/amd64,linux/arm64
+      --platform linux/amd64,linux/arm64,linux/arm/v7
       --tag "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:develop-$CI_COMMIT_SHORT_SHA"
       --tag "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:develop-$CI_COMMIT_SHORT_SHA" .
   except:
@@ -70,7 +70,7 @@ build:
     - docker buildx build
       --push
       --no-cache
-      --platform linux/amd64,linux/arm64
+      --platform linux/amd64,linux/arm64,linux/arm/v7
       --tag "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:$CI_COMMIT_TAG"
       --tag "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:latest"
       --tag "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:$CI_COMMIT_TAG"
diff --git a/Dockerfile b/Dockerfile
index 866a6a92ffac3e7a649bb72b8fbe6322ce944ef2..519e849ff32145738fa2ef52b1de7347a19508c2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,7 +19,7 @@ RUN \
     chmod a+x \
       /discord.sh
 
-FROM docker:20.10.12-dind-alpine3.15
+FROM mazzolino/docker:20.10.12-dind
 
 LABEL maintainer="Griefed <griefed@griefed.de>"
 LABEL description="Provides GitLab Semantic Release, buildx, JDK 8, NodeJS for Griefed's GitLab CI/CD pipelines."