diff --git a/.github/workflows/ci-master-pr.yml b/.github/workflows/ci-master-pr.yml
index c2577823..57a6bc19 100644
--- a/.github/workflows/ci-master-pr.yml
+++ b/.github/workflows/ci-master-pr.yml
@@ -101,7 +101,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: ${{ env.VARIANT_BUILD_DIR }}
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT_TAG_WITH_REF }}
@@ -120,7 +120,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: ${{ env.VARIANT_BUILD_DIR }}
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT_TAG_WITH_REF }}
@@ -138,7 +138,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: ${{ env.VARIANT_BUILD_DIR }}
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT_TAG }}
@@ -259,7 +259,7 @@ jobs:
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
         labels: |
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT_TAG_WITH_REF }}
@@ -282,7 +282,7 @@ jobs:
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
         labels: |
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT_TAG_WITH_REF }}
@@ -304,7 +304,7 @@ jobs:
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
         labels: |
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT_TAG }}
@@ -424,7 +424,7 @@ jobs:
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
         labels: |
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT_TAG_WITH_REF }}
@@ -447,7 +447,7 @@ jobs:
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
         labels: |
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT_TAG_WITH_REF }}
@@ -469,7 +469,7 @@ jobs:
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
         labels: |
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT_TAG }}
@@ -585,7 +585,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: ${{ env.VARIANT_BUILD_DIR }}
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT_TAG_WITH_REF }}
@@ -604,7 +604,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: ${{ env.VARIANT_BUILD_DIR }}
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT_TAG_WITH_REF }}
@@ -622,7 +622,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: ${{ env.VARIANT_BUILD_DIR }}
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT_TAG }}
@@ -742,7 +742,7 @@ jobs:
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
         labels: |
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT_TAG_WITH_REF }}
@@ -765,7 +765,7 @@ jobs:
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
         labels: |
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT_TAG_WITH_REF }}
@@ -787,7 +787,7 @@ jobs:
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
         labels: |
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT_TAG }}
@@ -907,7 +907,7 @@ jobs:
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
         labels: |
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT_TAG_WITH_REF }}
@@ -930,7 +930,7 @@ jobs:
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
         labels: |
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT_TAG_WITH_REF }}
@@ -952,7 +952,7 @@ jobs:
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
         labels: |
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT_TAG }}
@@ -1072,7 +1072,7 @@ jobs:
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
         labels: |
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT_TAG_WITH_REF }}
@@ -1095,7 +1095,7 @@ jobs:
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
         labels: |
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT_TAG_WITH_REF }}
@@ -1117,7 +1117,7 @@ jobs:
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
         labels: |
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT_TAG }}
@@ -1237,7 +1237,7 @@ jobs:
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
         labels: |
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT_TAG_WITH_REF }}
@@ -1260,7 +1260,7 @@ jobs:
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
         labels: |
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT_TAG_WITH_REF }}
@@ -1282,7 +1282,7 @@ jobs:
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
         labels: |
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT_TAG }}
@@ -1402,7 +1402,7 @@ jobs:
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
         labels: |
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT_TAG_WITH_REF }}
@@ -1425,7 +1425,7 @@ jobs:
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
         labels: |
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT_TAG_WITH_REF }}
@@ -1447,7 +1447,7 @@ jobs:
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
         labels: |
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT_TAG }}
@@ -1567,7 +1567,7 @@ jobs:
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
         labels: |
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT_TAG_WITH_REF }}
@@ -1590,7 +1590,7 @@ jobs:
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
         labels: |
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT_TAG_WITH_REF }}
@@ -1612,7 +1612,7 @@ jobs:
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
         labels: |
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT_TAG }}
@@ -1728,7 +1728,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: ${{ env.VARIANT_BUILD_DIR }}
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT_TAG_WITH_REF }}
@@ -1747,7 +1747,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: ${{ env.VARIANT_BUILD_DIR }}
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT_TAG_WITH_REF }}
@@ -1765,7 +1765,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: ${{ env.VARIANT_BUILD_DIR }}
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT_TAG }}
@@ -1885,7 +1885,7 @@ jobs:
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
         labels: |
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT_TAG_WITH_REF }}
@@ -1908,7 +1908,7 @@ jobs:
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
         labels: |
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT_TAG_WITH_REF }}
@@ -1930,7 +1930,7 @@ jobs:
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
         labels: |
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT_TAG }}
@@ -2050,7 +2050,7 @@ jobs:
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
         labels: |
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT_TAG_WITH_REF }}
@@ -2073,7 +2073,7 @@ jobs:
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
         labels: |
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT_TAG_WITH_REF }}
@@ -2095,7 +2095,7 @@ jobs:
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
         labels: |
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT_TAG }}
@@ -2211,7 +2211,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: ${{ env.VARIANT_BUILD_DIR }}
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT_TAG_WITH_REF }}
@@ -2230,7 +2230,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: ${{ env.VARIANT_BUILD_DIR }}
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT_TAG_WITH_REF }}
@@ -2248,7 +2248,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: ${{ env.VARIANT_BUILD_DIR }}
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT_TAG }}
@@ -2368,7 +2368,7 @@ jobs:
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
         labels: |
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT_TAG_WITH_REF }}
@@ -2391,7 +2391,7 @@ jobs:
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
         labels: |
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT_TAG_WITH_REF }}
@@ -2413,7 +2413,7 @@ jobs:
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
         labels: |
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT_TAG }}
@@ -2533,7 +2533,7 @@ jobs:
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
         labels: |
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT_TAG_WITH_REF }}
@@ -2556,7 +2556,7 @@ jobs:
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
         labels: |
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT_TAG_WITH_REF }}
@@ -2578,7 +2578,7 @@ jobs:
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
         labels: |
           BASE_IMAGE=${{ github.repository }}:${{ env.BASE_TAG_WITH_REF_AND_SHA_SHORT }}
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT_TAG }}
diff --git a/generate/definitions/VARIANTS.ps1 b/generate/definitions/VARIANTS.ps1
index eb601baa..6f52b252 100755
--- a/generate/definitions/VARIANTS.ps1
+++ b/generate/definitions/VARIANTS.ps1
@@ -81,7 +81,7 @@ $VARIANTS = @(
                             $variant['distro_version']
                         ) -join '-'
                     }
-                    platforms = 'linux/amd64'
+                    platforms ='linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64'
                     components = $subVariant['components']
                 }
                 # Docker image tag. E.g. 'v2.3.0.0-alpine-3.6'