diff --git a/versions.inc.sh b/versions.inc.sh
index c779580be..dd22ebe22 100644
--- a/versions.inc.sh
+++ b/versions.inc.sh
@@ -44,11 +44,11 @@ function version_tags() {
 
     # Extra tags
     if [[ "$image_name" == "wikibase" ]]; then
-        tags+=("${WIKIBASE_VERSION}+mw-${MEDIAWIKI_VERSION}")
+        tags+=("${WIKIBASE_VERSION}-mw${MEDIAWIKI_VERSION}")
     elif [[ "$image_name" == "elasticsearch" ]]; then
-        tags+=("${ELASTICSEARCH_WBS_VERSION}+${ELASTICSEARCH_VERSION}")
+        tags+=("${ELASTICSEARCH_WBS_VERSION}-${ELASTICSEARCH_VERSION}")
     elif [[ "$image_name" == "wdqs" ]]; then
-        tags+=("${WDQS_WBS_VERSION}+${WDQS_VERSION}")
+        tags+=("${WDQS_WBS_VERSION}-${WDQS_VERSION}")
     fi
 
     printf "%s\n" "${tags[@]}"