diff --git a/apps/app-runner/Dockerfile b/apps/app-runner/Dockerfile.golang.1.20.0
similarity index 68%
copy from apps/app-runner/Dockerfile
copy to apps/app-runner/Dockerfile.golang.1.20.0
index 964cd31..16f484f 100644
--- a/apps/app-runner/Dockerfile
+++ b/apps/app-runner/Dockerfile.golang.1.20.0
@@ -1,4 +1,4 @@
-FROM golang:1.22.0-bookworm
+FROM golang:1.20.0-alpine3.17
 
 ARG TARGETARCH
 
diff --git a/apps/app-runner/Dockerfile b/apps/app-runner/Dockerfile.golang.1.22.0
similarity index 68%
rename from apps/app-runner/Dockerfile
rename to apps/app-runner/Dockerfile.golang.1.22.0
index 964cd31..af75fe6 100644
--- a/apps/app-runner/Dockerfile
+++ b/apps/app-runner/Dockerfile.golang.1.22.0
@@ -1,4 +1,4 @@
-FROM golang:1.22.0-bookworm
+FROM golang:1.22.0-alpine3.19
 
 ARG TARGETARCH
 
diff --git a/apps/app-runner/Makefile b/apps/app-runner/Makefile
index 8a8936a..11a659d 100644
--- a/apps/app-runner/Makefile
+++ b/apps/app-runner/Makefile
@@ -1,7 +1,9 @@
 repo_name ?= giolekva
 podman ?= docker
 ifeq ($(podman), podman)
-manifest_dest=docker://docker.io/$(repo_name)/app-runner:golang-1.22.0
+manifest_dest_golang_1_22_0=docker://docker.io/$(repo_name)/app-runner:golang-1.22.0
+manifest_dest_golang_1_20_0=docker://docker.io/$(repo_name)/app-runner:golang-1.20.0
+manifest_dest_hugo_latest=docker://docker.io/$(repo_name)/app-runner:hugo-latest
 endif
 
 clean:
@@ -21,19 +23,36 @@
 build_amd64:
 	/usr/local/go/bin/go build -o app-runner_amd64 *.go
 
-push_arm64: clean build_arm64
-	$(podman) build --platform linux/arm64 --tag=$(repo_name)/app-runner:golang-1.22.0-arm64 .
+# Golang 1.22.0
+
+push_golang_1_22_0_arm64: clean build_arm64
+	$(podman) build --platform linux/arm64 --tag=$(repo_name)/app-runner:golang-1.22.0-arm64 -f Dockerfile.golang.1.22.0 .
 	$(podman) push $(repo_name)/app-runner:golang-1.22.0-arm64
 
-push_amd64: clean build_amd64
-	$(podman) build --platform linux/amd64 --tag=$(repo_name)/app-runner:golang-1.22.0-amd64 .
+push_golang_1_22_0_amd64: clean build_amd64
+	$(podman) build --platform linux/amd64 --tag=$(repo_name)/app-runner:golang-1.22.0-amd64 -f Dockerfile.golang.1.22.0 .
 	$(podman) push $(repo_name)/app-runner:golang-1.22.0-amd64
 
-push: push_arm64 push_amd64
+push_golang_1_22_0: push_golang_1_22_0_arm64 push_golang_1_22_0_amd64
 	$(podman) manifest create $(repo_name)/app-runner:golang-1.22.0 $(repo_name)/app-runner:golang-1.22.0-arm64 $(repo_name)/app-runner:golang-1.22.0-amd64
-	$(podman) manifest push $(repo_name)/app-runner:golang-1.22.0 $(manifest_dest)
+	$(podman) manifest push $(repo_name)/app-runner:golang-1.22.0 $(manifest_dest_golang_1_22_0)
 	$(podman) manifest rm $(repo_name)/app-runner:golang-1.22.0
 
+# Golang 1.20.0
+
+push_golang_1_20_0_arm64: clean build_arm64
+	$(podman) build --platform linux/arm64 --tag=$(repo_name)/app-runner:golang-1.20.0-arm64 -f Dockerfile.golang.1.20.0 .
+	$(podman) push $(repo_name)/app-runner:golang-1.20.0-arm64
+
+push_golang_1_20_0_amd64: clean build_amd64
+	$(podman) build --platform linux/amd64 --tag=$(repo_name)/app-runner:golang-1.20.0-amd64 -f Dockerfile.golang.1.20.0 .
+	$(podman) push $(repo_name)/app-runner:golang-1.20.0-amd64
+
+push_golang_1_20_0: push_golang_1_20_0_arm64 push_golang_1_20_0_amd64
+	$(podman) manifest create $(repo_name)/app-runner:golang-1.20.0 $(repo_name)/app-runner:golang-1.20.0-arm64 $(repo_name)/app-runner:golang-1.20.0-amd64
+	$(podman) manifest push $(repo_name)/app-runner:golang-1.20.0 $(manifest_dest_golang_1_20_0)
+	$(podman) manifest rm $(repo_name)/app-runner:golang-1.20.0
+
 # Hugo
 
 push_hugo_arm64: clean build_arm64
@@ -46,5 +65,8 @@
 
 push_hugo: push_hugo_arm64 push_hugo_amd64
 	$(podman) manifest create $(repo_name)/app-runner:hugo-latest $(repo_name)/app-runner:hugo-latest-arm64 $(repo_name)/app-runner:hugo-latest-amd64
-	$(podman) manifest push $(repo_name)/app-runner:hugo-latest $(manifest_dest)
+	$(podman) manifest push $(repo_name)/app-runner:hugo-latest $(manifest_dest_hugo_latest)
 	$(podman) manifest rm $(repo_name)/app-runner:hugo-latest
+
+# all
+push: push_golang_1_22_0 push_golang_1_20_0 push_hugo