diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d28abff..75dde0f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -103,11 +103,11 @@ jobs:
           push: true
           platforms: linux/amd64
 
-  tf2-sourcemod:
+  tf2-sourcemod-i386:
     runs-on: ubuntu-latest
     needs: tf2-base-i386
     outputs:
-      tf2-sourcemod-tag: ${{ steps.docker_meta.outputs.version }}
+      tf2-sourcemod-i386-tag: ${{ steps.docker_meta.outputs.version }}
 
     steps:
       - name: Checkout
@@ -142,15 +142,61 @@ jobs:
         with:
           context: ./packages/tf2-sourcemod
           build-args: |
+            ARCH=i386
             TF2_BASE_TAG=${{ needs.tf2-base-i386.outputs.tf2-base-i386-tag }}
           tags: ${{ steps.docker_meta.outputs.tags }}
           labels: ${{ steps.docker_meta.outputs.labels }}
           push: true
           platforms: linux/amd64
+  
+  tf2-sourcemod-amd64:
+    runs-on: ubuntu-latest
+    needs: tf2-base-amd64
+    outputs:
+      tf2-sourcemod-amd64-tag: ${{ steps.docker_meta.outputs.version }}
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Docker meta
+        id: docker_meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ env.REGISTRY }}/melkortf/tf2-sourcemod/amd64
+          tags: |
+            type=sha,format=long
+            type=schedule,pattern=nightly
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          context: ./packages/tf2-sourcemod
+          build-args: |
+            ARCH=amd64
+            TF2_BASE_TAG=${{ needs.tf2-base-amd64.outputs.tf2-base-amd64-tag }}
+          tags: ${{ steps.docker_meta.outputs.tags }}
+          labels: ${{ steps.docker_meta.outputs.labels }}
+          push: true
+          platforms: linux/amd64
 
   tf2-mge:
     runs-on: ubuntu-latest
-    needs: tf2-sourcemod
+    needs: tf2-sourcemod-i386
 
     steps:
       - name: Checkout
@@ -185,7 +231,7 @@ jobs:
         with:
           context: ./packages/tf2-mge
           build-args: |
-            TF2_SOURCEMOD_TAG=${{ needs.tf2-sourcemod.outputs.tf2-sourcemod-tag }}
+            TF2_SOURCEMOD_TAG=${{ needs.tf2-sourcemod-i386.outputs.tf2-sourcemod-i386-tag }}
           tags: ${{ steps.docker_meta.outputs.tags }}
           labels: ${{ steps.docker_meta.outputs.labels }}
           push: true
@@ -193,7 +239,7 @@ jobs:
 
   tf2-competitive:
     runs-on: ubuntu-latest
-    needs: tf2-sourcemod
+    needs: tf2-sourcemod-i386
 
     steps:
       - name: Checkout
@@ -228,7 +274,7 @@ jobs:
         with:
           context: ./packages/tf2-competitive
           build-args: |
-            TF2_SOURCEMOD_TAG=${{ needs.tf2-sourcemod.outputs.tf2-sourcemod-tag }}
+            TF2_SOURCEMOD_TAG=${{ needs.tf2-sourcemod-i386.outputs.tf2-sourcemod-i386-tag }}
           tags: ${{ steps.docker_meta.outputs.tags }}
           labels: ${{ steps.docker_meta.outputs.labels }}
           push: true
@@ -236,7 +282,7 @@ jobs:
 
   tf2-dm:
     runs-on: ubuntu-latest
-    needs: tf2-sourcemod
+    needs: tf2-sourcemod-i386
 
     steps:
       - name: Checkout
@@ -271,7 +317,7 @@ jobs:
         with:
           context: ./packages/tf2-dm
           build-args: |
-            TF2_SOURCEMOD_TAG=${{ needs.tf2-sourcemod.outputs.tf2-sourcemod-tag }}
+            TF2_SOURCEMOD_TAG=${{ needs.tf2-sourcemod-i386.outputs.tf2-sourcemod-i386-tag }}
           tags: ${{ steps.docker_meta.outputs.tags }}
           labels: ${{ steps.docker_meta.outputs.labels }}
           push: true