diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml
index 8777cdd..c6cae38 100644
--- a/.github/workflows/build-and-push.yml
+++ b/.github/workflows/build-and-push.yml
@@ -35,7 +35,33 @@ jobs:
     needs: [build-and-push-base]
     strategy:
       matrix:
-        year: [2017, 2018, 2019, 2020, 2021, 2022, 2022-gradle, 2023-gradle, 2023-python]
+        year: [2017, 2018, 2019, 2020, 2021, 2022]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Build image
+        uses: docker/build-push-action@v3
+        with:
+          context: ./${{ matrix.year }}
+          push: true
+          tags: maxkratz/texlive:${{ matrix.year }}
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
+
+  build-and-push-image-variants:
+    runs-on: [ubuntu-22.04]
+    needs: [build-and-push-image]
+    strategy:
+      matrix:
+        year: [2022-gradle, 2023-gradle, 2023-python]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -86,7 +112,7 @@ jobs:
           platforms: linux/amd64,linux/arm64,linux/arm/v7
   
   # 2016 can not be built with arm64 support
-  build-and-push-2016-mage:
+  build-and-push-2016-image:
     runs-on: [ubuntu-22.04]
     needs: [build-and-push-base]
     strategy:
diff --git a/.github/workflows/build-only.yml b/.github/workflows/build-only.yml
index 5977c6e..f6c47fa 100644
--- a/.github/workflows/build-only.yml
+++ b/.github/workflows/build-only.yml
@@ -30,7 +30,28 @@ jobs:
     needs: [build-base]
     strategy:
       matrix:
-        year: [2017, 2018, 2019, 2020, 2021, 2022, 2022-gradle, 2023-gradle, 2023-python]
+        year: [2017, 2018, 2019, 2020, 2021, 2022]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Build image
+        uses: docker/build-push-action@v3
+        with:
+          context: ./${{ matrix.year }}
+          push: false
+          tags: maxkratz/texlive:${{ matrix.year }}
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
+
+  build-image-variants:
+    runs-on: [ubuntu-22.04]
+    needs: [build-image]
+    strategy:
+      matrix:
+        year: [2022-gradle, 2023-gradle, 2023-python]
     steps:
       - name: Checkout
         uses: actions/checkout@v3