diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000..429a3d6
Binary files /dev/null and b/.DS_Store differ
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 7112ad0..2b27cf7 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -37,11 +37,15 @@ jobs:
         with:
           images: ghcr.io/${{ github.repository }}
           tags: |
-            type=ref,event=branch,enable=true
-            type=ref,event=tag,enable=true
+            type=ref,event=tag
+            type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'master') }}
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern={{major}}
+            type=semver,pattern=v{{version}}
+            type=semver,pattern=v{{major}}.{{minor}}
+            type=semver,pattern=v{{major}}
+            type=sha,format=short
 
       - name: Build and push Docker image
         uses: docker/build-push-action@v6
diff --git a/internal/domain/peer.go b/internal/domain/peer.go
index 519d551..769730d 100644
--- a/internal/domain/peer.go
+++ b/internal/domain/peer.go
@@ -123,8 +123,11 @@ func (p *Peer) ApplyInterfaceDefaults(in *Interface) {
 }
 
 func (p *Peer) GenerateDisplayName(prefix string) {
+	if p.DisplayName != "" {
+		return
+	}
 	if prefix != "" {
-		prefix = fmt.Sprintf("%s ", strings.TrimSpace(prefix)) // add a space after the prefix
+		prefix = fmt.Sprintf("%s ", strings.TrimSpace(prefix))
 	}
 	p.DisplayName = fmt.Sprintf("%sPeer %s", prefix, internal.TruncateString(string(p.Identifier), 8))
 }