diff --git a/Makefile b/Makefile
index 494f318db..dd8a7241d 100644
--- a/Makefile
+++ b/Makefile
@@ -61,9 +61,9 @@ build/docker:
 build/docker/$(STACK_VERSION): bindata.go
 ifeq ($(BUILDX),true)
 ifeq ($(STACK_VERSION),20)
-	docker buildx build --no-cache ${DOCKER_ARGS} --pull --progress plain --platform linux/arm,linux/arm64/v8,linux/amd64 --build-arg STACK_VERSION=$(STACK_VERSION) --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-$(STACK_VERSION) -t $(IMAGE_NAME):latest-$(STACK_VERSION) -t $(IMAGE_NAME):$(BUILD_TAG) -t $(IMAGE_NAME):latest .
+	docker buildx build --no-cache ${DOCKER_ARGS} --pull --progress plain --platform linux/arm64/v8,linux/amd64 --build-arg STACK_VERSION=$(STACK_VERSION) --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-$(STACK_VERSION) -t $(IMAGE_NAME):latest-$(STACK_VERSION) -t $(IMAGE_NAME):$(BUILD_TAG) -t $(IMAGE_NAME):latest .
 else
-	docker buildx build --no-cache ${DOCKER_ARGS} --pull --progress plain --platform linux/arm,linux/arm64/v8,linux/amd64 --build-arg STACK_VERSION=$(STACK_VERSION) --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-$(STACK_VERSION) -t $(IMAGE_NAME):latest-$(STACK_VERSION) .
+	docker buildx build --no-cache ${DOCKER_ARGS} --pull --progress plain --platform linux/arm64/v8,linux/amd64 --build-arg STACK_VERSION=$(STACK_VERSION) --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-$(STACK_VERSION) -t $(IMAGE_NAME):latest-$(STACK_VERSION) .
 endif
 else
 	docker build --no-cache ${DOCKER_ARGS} --pull --progress plain --build-arg STACK_VERSION=$(STACK_VERSION) --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-$(STACK_VERSION) -t $(IMAGE_NAME):latest-$(STACK_VERSION) -t $(IMAGE_NAME):$(BUILD_TAG) .
diff --git a/bin/setup.sh b/bin/setup.sh
index 5f077cd7d..7f3132e0a 100755
--- a/bin/setup.sh
+++ b/bin/setup.sh
@@ -10,18 +10,13 @@ setup_02="$(cat /tmp/setup-02.sh)"
 echo "$setup_01" >/tmp/setup-01.sh
 chmod +x /tmp/setup-01.sh
 
-# Ensure we install from ports for arm/arm64 systems
+# Ensure we install from ports for arm64 systems
 # Skip unsupported syslinux
 if [[ -n "$TARGETARCH" ]] && [[ "$TARGETARCH" != "amd64" ]]; then
   sed -i 's#http://archive.ubuntu.com/ubuntu/#http://ports.ubuntu.com/ubuntu-ports/#' /tmp/setup-01.sh
   sed -i '/syslinux/d' /tmp/setup-01.sh
 fi
 
-# Skip unsupported postgresql on arm:20
-if [[ "$TARGETARCH" == "arm" ]]; then
-  sed -i '/postgresql-client-16/d' /tmp/setup-01.sh
-fi
-
 # from base image
 /tmp/setup-01.sh
 
@@ -41,11 +36,6 @@ rm -rf /var/lib/apt/lists/*
 echo "$setup_02" >/tmp/setup-02.sh
 chmod +x /tmp/setup-02.sh
 
-# Skip unsupported postgresql on arm:20
-if [[ "$TARGETARCH" == "arm" ]]; then
-  sed -i '/postgresql-server-dev-16/d' /tmp/setup-02.sh
-fi
-
 # from build image
 /tmp/setup-02.sh