diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 36a8101..6fd7f90 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -51,7 +51,7 @@ jobs:
 
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v2
-        if: success() && startsWith(github.ref, 'refs/tags/')
+        if: success() && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master')
         with:
           version: latest
           args: release --rm-dist
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index a31bb73..2261c0e 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -18,5 +18,7 @@ changelog:
       - '^docs:'
       - '^test:'
 dockers:
-- image_templates: ["minetestmapserver/mapserver:{{ .Version }}"]
+- image_templates:
+    - "minetestmapserver/mapserver:{{ .Version }}"
+    - "minetestmapserver/mapserver:latest"
   dockerfile: Dockerfile
\ No newline at end of file