diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml
index d7b02c2ab..711075f5f 100644
--- a/.github/workflows/ci-main.yml
+++ b/.github/workflows/ci-main.yml
@@ -234,7 +234,7 @@ jobs:
         arch:
           - 'linux/amd64'
           - 'linux/arm64'
-          - 'linux/arm/v7'
+          # - 'linux/arm/v7'
     steps:
       - uses: actions/checkout@v2
       - name: Set up Docker Buildx
diff --git a/.github/workflows/ci-outpost.yml b/.github/workflows/ci-outpost.yml
index cc56891eb..33ad947ca 100644
--- a/.github/workflows/ci-outpost.yml
+++ b/.github/workflows/ci-outpost.yml
@@ -42,7 +42,7 @@ jobs:
         arch:
           - 'linux/amd64'
           - 'linux/arm64'
-          - 'linux/arm/v7'
+          # - 'linux/arm/v7'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml
index 4d31b7be4..c630f054d 100644
--- a/.github/workflows/release-publish.yml
+++ b/.github/workflows/release-publish.yml
@@ -8,6 +8,13 @@ jobs:
   # Build
   build-server:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        arch:
+          - 'linux/amd64'
+          - 'linux/arm64'
+          # - 'linux/arm/v7'
     steps:
       - uses: actions/checkout@v2
       - name: Set up QEMU
@@ -34,7 +41,7 @@ jobs:
             beryju/authentik:latest,
             ghcr.io/goauthentik/server:2021.10.4,
             ghcr.io/goauthentik/server:latest
-          platforms: linux/amd64,linux/arm64
+          platforms: ${{ matrix.arch }}
           context: .
       - name: Building Docker Image (stable)
         if: ${{ github.event_name == 'release' && !contains('2021.10.4', 'rc') }}
@@ -45,8 +52,18 @@ jobs:
           docker pull ghcr.io/goauthentik/server:latest
           docker tag ghcr.io/goauthentik/server:latest ghcr.io/goauthentik/server:stable
           docker push ghcr.io/goauthentik/server:stable
-  build-proxy:
+  build-outpost:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        type:
+          - proxy
+          - ldap
+        arch:
+          - 'linux/amd64'
+          - 'linux/arm64'
+          # - 'linux/arm/v7'
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
@@ -72,68 +89,25 @@ jobs:
         with:
           push: ${{ github.event_name == 'release' }}
           tags: |
-            beryju/authentik-proxy:2021.10.4,
-            beryju/authentik-proxy:latest,
-            ghcr.io/goauthentik/proxy:2021.10.4,
-            ghcr.io/goauthentik/proxy:latest
-          file: proxy.Dockerfile
-          platforms: linux/amd64,linux/arm64
+            beryju/authentik-${{ matrix.type }}:2021.10.4,
+            beryju/authentik-${{ matrix.type }}:latest,
+            ghcr.io/goauthentik/${{ matrix.type }}:2021.10.4,
+            ghcr.io/goauthentik/${{ matrix.type }}:latest
+          file: ${{ matrix.type }}.Dockerfile
+          platforms: ${{ matrix.arch }}
       - name: Building Docker Image (stable)
         if: ${{ github.event_name == 'release' && !contains('2021.10.4', 'rc') }}
         run: |
-          docker pull beryju/authentik-proxy:latest
-          docker tag beryju/authentik-proxy:latest beryju/authentik-proxy:stable
-          docker push beryju/authentik-proxy:stable
-          docker pull ghcr.io/goauthentik/proxy:latest
-          docker tag ghcr.io/goauthentik/proxy:latest ghcr.io/goauthentik/proxy:stable
-          docker push ghcr.io/goauthentik/proxy:stable
-  build-ldap:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-go@v2
-        with:
-          go-version: "^1.15"
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1.2.0
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - name: Docker Login Registry
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v1
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Building Docker Image
-        uses: docker/build-push-action@v2
-        with:
-          push: ${{ github.event_name == 'release' }}
-          tags: |
-            beryju/authentik-ldap:2021.10.4,
-            beryju/authentik-ldap:latest,
-            ghcr.io/goauthentik/ldap:2021.10.4,
-            ghcr.io/goauthentik/ldap:latest
-          file: ldap.Dockerfile
-          platforms: linux/amd64,linux/arm64
-      - name: Building Docker Image (stable)
-        if: ${{ github.event_name == 'release' && !contains('2021.10.4', 'rc') }}
-        run: |
-          docker pull beryju/authentik-ldap:latest
-          docker tag beryju/authentik-ldap:latest beryju/authentik-ldap:stable
-          docker push beryju/authentik-ldap:stable
-          docker pull ghcr.io/goauthentik/ldap:latest
-          docker tag ghcr.io/goauthentik/ldap:latest ghcr.io/goauthentik/ldap:stable
-          docker push ghcr.io/goauthentik/ldap:stable
+          docker pull beryju/authentik-${{ matrix.type }}:latest
+          docker tag beryju/authentik-${{ matrix.type }}:latest beryju/authentik-${{ matrix.type }}:stable
+          docker push beryju/authentik-${{ matrix.type }}:stable
+          docker pull ghcr.io/goauthentik/${{ matrix.type }}:latest
+          docker tag ghcr.io/goauthentik/${{ matrix.type }}:latest ghcr.io/goauthentik/${{ matrix.type }}:stable
+          docker push ghcr.io/goauthentik/${{ matrix.type }}:stable
   test-release:
     needs:
       - build-server
-      - build-proxy
-      - build-ldap
+      - build-outpost
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2