diff --git a/.goreleaser-nightly.yml b/.goreleaser-nightly.yml
index 0febcaea..6365b120 100644
--- a/.goreleaser-nightly.yml
+++ b/.goreleaser-nightly.yml
@@ -20,10 +20,10 @@ dockers:
     skip_push: true
     dockerfile: docker/Dockerfile.nightly
     build_flag_templates:
-      - '--build-arg=VERSION=nightly-{{ time "20060102" }}'
+      - '--build-arg=VERSION={{ if index .Env "IMAGE_NAME"  }}{{ .Env.IMAGE_NAME }}{{ else if not (eq .Branch "main" "dev" "") }}{{ replace .Branch "/" "-" }}{{ else }}nightly{{ end }}-{{ time "20060102" }}'
     image_templates:
       - synadia/nats-server:{{.Version}}
-      - synadia/nats-server:nightly
+      - synadia/nats-server:{{ if index .Env "IMAGE_NAME"  }}{{ .Env.IMAGE_NAME }}{{ else if not (eq .Branch "main" "dev" "") }}{{ replace .Branch "/" "-" }}{{ else }}nightly{{ end }}
     extra_files:
       - docker/nats-server.conf
 
@@ -32,4 +32,4 @@ checksum:
   algorithm: sha256
 
 snapshot:
-  name_template: 'nightly-{{ time "20060102" }}'
+  name_template: '{{ if index .Env "IMAGE_NAME"  }}{{ .Env.IMAGE_NAME }}{{ else if not (eq .Branch "main" "dev" "") }}{{ replace .Branch "/" "-" }}{{ else }}nightly{{ end }}-{{ time "20060102" }}'