diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 1b9cfc933..24ac018a9 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -89,7 +89,7 @@ jobs:
           GITHUB_REF: ${{ github.ref }}
         run: |
           if [ "$GITHUB_REF" == "refs/heads/main" ]; then
-            TAG=main
+            TAG=main${{ inputs.tag-suffix }}
           else
             TAG=$(make docker.tag)
           fi
@@ -99,7 +99,7 @@ jobs:
         if: env.IS_FORK == 'false'
         shell: bash
         env:
-          IMAGE_TAG: ${{ steps.container_info.outputs.image-tag }}${{ inputs.tag-suffix }}
+          IMAGE_TAG: ${{ steps.container_info.outputs.image-tag }}
           BUILD_ARGS: >-
             --push
             --platform linux/amd64,linux/arm64
@@ -109,7 +109,7 @@ jobs:
         if: env.IS_FORK == 'true'
         shell: bash
         env:
-          IMAGE_TAG: ${{ steps.container_info.outputs.image-tag }}${{ inputs.tag-suffix }}
+          IMAGE_TAG: ${{ steps.container_info.outputs.image-tag }}
           BUILD_ARGS: --load
         run: make docker.build
 
diff --git a/Dockerfile.standalone b/Dockerfile.standalone
index 77a39f27c..90bcf15b4 100644
--- a/Dockerfile.standalone
+++ b/Dockerfile.standalone
@@ -1,5 +1,5 @@
 # This version of Dockerfile is for building without external dependencies.
-FROM golang:1.19.1-alpine AS builder
+FROM golang:1.19.2-alpine AS builder
 ENV CGO_ENABLED=0 GOOS=linux GOARCH=amd64
 WORKDIR /app
 # Avoid invalidating the `go mod download` cache when only code has changed.