diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index 0d0072a..6fbff31 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -8,9 +8,17 @@ jobs:
     steps:
       - name: Check out
         uses: actions/checkout@v4
+      - name: Check Architecture
+        run: |
+          if [ "$ARCH" = "x86_64" ]; then \
+            ARCH="amd64"; \
+          elif [ "$ARCH" = "aarch64" ]; then \
+            ARCH="${ARCH}"; \
+          fi
       - name: Build Image
         run: |
-          docker build --build-arg PRODUCT=terraform --build-arg VERSION=1.10.5 -t gitea.jrdn.dev/${{vars.REPO_USERNAME}}/terraform-alpine:latest .
+          docker build --build-arg PRODUCT=terraform --build-arg VERSION=1.10.5 --build-arg=$ARCH \
+          -t gitea.jrdn.dev/${{vars.REPO_USERNAME}}/terraform-alpine:latest .
       - name: Authenticate to Container Registry
         run: |
           docker login -u ${{vars.REPO_USERNAME}} -p ${{secrets.REPO_TOKEN}} gitea.jrdn.dev
diff --git a/Dockerfile b/Dockerfile
index 1e0a80f..3354bf1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,13 +2,7 @@ FROM alpine:latest
  
 ARG PRODUCT
 ARG VERSION
-
-RUN ARCH=$(uname -m) && \
-    if [ "$ARCH" = "x86_64" ]; then \
-      ARCH="amd64"; \
-    elif [ "$ARCH" = "aarch64" ]; then \
-      ARCH="${ARCH}"; \
-    fi
+ARG ARCH
 
 RUN apk add --no-cache git npm bash