diff --git a/docker/bin/elastic-version b/docker/bin/elastic-version
index 68790168d..3352cec34 100755
--- a/docker/bin/elastic-version
+++ b/docker/bin/elastic-version
@@ -12,7 +12,7 @@ end
 
 def qualify(version)
   qualifier = ENV['VERSION_QUALIFIER']
-  qualifier ? [version, qualifier].join("-") : version
+  qualifier.nil? || qualifier.empty? ? version : [version, qualifier].join("-")
 end
 
 def get_version