diff --git a/dist/.goreleaser-docker.yaml b/dist/.goreleaser-docker.yaml
index db8cb50f9..571556088 100644
--- a/dist/.goreleaser-docker.yaml
+++ b/dist/.goreleaser-docker.yaml
@@ -82,5 +82,27 @@ docker_manifests:
     - --insecure
     skip_push: false
 
+  - id: scylla-manager-latest
+    name_template: "scylladb/scylla-manager:latest"
+    image_templates:
+    - "scylladb/scylla-manager:{{ .Version }}-x86_64"
+    - "scylladb/scylla-manager:{{ .Version }}-aarch64"
+    create_flags:
+    - --insecure
+    push_flags:
+    - --insecure
+    skip_push: "{{ no .Env.LATEST_RELEASE }}"
+  
+  - id: scylla-manager-agent-latest
+    name_template: "scylladb/scylla-manager-agent:latest"
+    image_templates:
+    - "scylladb/scylla-manager-agent:{{ .Version }}-x86_64"
+    - "scylladb/scylla-manager-agent:{{ .Version }}-aarch64"
+    create_flags:
+    - --insecure
+    push_flags:
+    - --insecure
+    skip_push: "{{ no .Env.LATEST_RELEASE }}"
+
 checksum:
   name_template: 'checksums'
diff --git a/dist/Makefile b/dist/Makefile
index 384532ec4..af789eecc 100644
--- a/dist/Makefile
+++ b/dist/Makefile
@@ -1,6 +1,7 @@
-RELEASE      := 0.$(shell date +%Y%m%d).$(shell git describe --always)
-VERSION         ?=3.5.0-dev
-PUBLISH      := 0
+RELEASE        := 0.$(shell date +%Y%m%d).$(shell git describe --always)
+VERSION        ?=3.5.0-dev
+PUBLISH        := 0
+LATEST_RELEASE := false
 
 ifdef $$VERSION
 VERSION := $$VERSION
@@ -11,6 +12,7 @@ publish = --skip=publish
 VERSION_NAME := $(VERSION)-$(RELEASE)
 else
 VERSION_NAME := v$(VERSION)
+LATEST_RELEASE := true
 endif
 
 $(shell echo $(VERSION) > .version)
@@ -21,7 +23,7 @@ GORELEASER := goreleaser --clean
 release:
 	git tag -f $(VERSION_NAME)
 	$(GORELEASER) $(publish) --skip=validate --config .goreleaser.yaml
-	$(GORELEASER) --skip=validate --config .goreleaser-docker.yaml
+	LATEST_RELEASE=$(LATEST_RELEASE) $(GORELEASER) --skip=validate --config .goreleaser-docker.yaml
 
 .PHONY: snapshot
 snapshot: