diff --git a/.github/workflows/defaults.yaml b/.github/workflows/defaults.yaml
index 94371b2..1c8ffaa 100644
--- a/.github/workflows/defaults.yaml
+++ b/.github/workflows/defaults.yaml
@@ -30,7 +30,7 @@ jobs:
         uses: goreleaser/goreleaser-action@v5
         with:
           version: latest
-          args: release --rm-dist
+          args: release --clean
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
diff --git a/.goreleaser.yml b/.goreleaser.yml
index e56c269..3238f7d 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -13,10 +13,13 @@ builds:
       - amd64
 
 archives:
-  - replacements:
-      linux: Linux
-      386: i386
-      amd64: x86_64
+  - name_template: >-
+      {{- .ProjectName }}_
+      {{- title .Os }}_
+      {{- if eq .Arch "amd64" }}x86_64
+      {{- else if eq .Arch "386" }}i386
+      {{- else }}{{ .Arch }}{{ end }}
+      {{- if .Arm }}v{{ .Arm }}{{ end -}}
 
 checksum:
   name_template: 'checksums.txt'
diff --git a/Dockerfile b/Dockerfile
index 4b8066c..10980d3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.15.3-alpine3.12 as build
+FROM golang:1.21-alpine as build
 
 WORKDIR /src/prometheus-timestream-adapter
 ADD . /src/prometheus-timestream-adapter