diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0dcc4609..8e8a3bd0 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -23,6 +23,24 @@ jobs:
             postgis: '2.5'
           - postgres: '14beta3'
             postgis: '2.5'
+          - postgres: 9.6
+            postgis: '2.5'
+            variant: default
+          - postgres: 9.6
+            postgis: '3.1'
+            variant: default
+          - postgres: 10
+            postgis: '2.5'
+            variant: default
+          - postgres: 10
+            postgis: '3.1'
+            variant: default
+          - postgres: 11
+            postgis: '2.5'
+            variant: default
+          - postgres: 11
+            postgis: '3.1'
+            variant: default
         include:
           - postgres: 12
             postgis: master
@@ -41,6 +59,10 @@ jobs:
     - name: Checkout source
       uses: actions/checkout@v2
 
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v1
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v1
     - name: Build docker image for ${{ env.VERSION }} ${{ env.VARIANT }}
       run: make test
 
diff --git a/Makefile b/Makefile
index eda5dbff..e71b6613 100644
--- a/Makefile
+++ b/Makefile
@@ -123,11 +123,11 @@ push: $(foreach version,$(VERSIONS),push-$(version)) $(PUSH_DEP)
 define push-version
 push-$1: test-$1
 ifeq ($(do_default),true)
-	$(DOCKER) image push $(REPO_NAME)/$(IMAGE_NAME):$(version)
+	$(DOCKER) buildx build --platform linux/arm64,linux/amd64 -t $(REPO_NAME)/$(IMAGE_NAME):$(shell echo $1) $1
 endif
 ifeq ($(do_alpine),true)
 ifneq ("$(wildcard $1/alpine)","")
-	$(DOCKER) image push $(REPO_NAME)/$(IMAGE_NAME):$(version)-alpine
+	$(DOCKER) buildx build --platform linux/arm64,linux/amd64 -t $(REPO_NAME)/$(IMAGE_NAME):$(shell echo $1)-alpine $1/alpine
 endif
 endif
 endef