diff --git a/script/gh/docker-tags.rb b/script/gh/docker-tags.rb
index 6b4e5791caf..50124045b94 100755
--- a/script/gh/docker-tags.rb
+++ b/script/gh/docker-tags.rb
@@ -17,7 +17,11 @@ class Tag
   end
 
   def version
-    @tag.sub(/^v/, "").sub(/-rc$/, "")
+    if semver?
+      @tag.sub(/^v/, "").sub(/-rc$/, "")
+    else
+      @tag.sub(/-rc$/, "")
+    end
   end
 
   def to_semver_docker_tags