diff --git a/Dockerfile b/Dockerfile
index 9faf8c5..a80de6e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.7-alpine
+FROM python:3.12-alpine
 
 WORKDIR /app
 
diff --git a/Makefile b/Makefile
index 2e16edf..41ed85d 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,31 @@ test-gitleaks-config:
 
 test: test-config-generator test-gitleaks-config
 
-build-public-ecr: build
+build-amd64:
+	docker buildx build \
+		--platform linux/amd64 \
+		-t $(IMAGE_NAME):${IMAGE_TAG}-amd64 \
+		--load \
+		.
+
+build-arm64:
+	docker buildx build \
+		--platform linux/arm64 \
+		-t $(IMAGE_NAME):${IMAGE_TAG}-arm64 \
+		--load \
+		.
+
+build-multiarch-local: build-amd64 build-arm64
+
+push-multiarch:
+	docker buildx build \
+		--platform linux/amd64,linux/arm64 \
+		-t $(IMAGE_NAME):${IMAGE_TAG} \
+		-t $(IMAGE_NAME):latest \
+		--push \
+		.
+
+# Public ECR Jenkins file required targets
+build-public-ecr: build-multiarch-local
 
-push-public-ecr:
-	docker push $(IMAGE_NAME):${IMAGE_TAG}
+push-public-ecr: push-multiarch