diff --git a/plugins/docker/src/image-info.ts b/plugins/docker/src/image-info.ts
index 5b098bdd3..e5a766110 100644
--- a/plugins/docker/src/image-info.ts
+++ b/plugins/docker/src/image-info.ts
@@ -27,7 +27,7 @@ export function getImageTagsFromEnvironment({
 
   const gitTag = process.env.CIRCLE_TAG
   if (gitTag) {
-    tags.push(`git-${gitTag}`)
+    tags.push(`release-${gitTag}`)
   }
 
   const buildNumber = process.env.CIRCLE_BUILD_NUM
@@ -37,6 +37,11 @@ export function getImageTagsFromEnvironment({
     tags.push(`local-${process.env.USER || 'unknown'}`)
   }
 
+  const branchName = process.env.CIRCLE_BRANCH
+  if (branchName) {
+    tags.push(`branch-${branchName}`)
+  }
+
   const imageName = buildImageName({ registry, name })
   return tags.map((tag) => `${imageName}:${sanitizeDockerTag(tag)}`)
 }