diff --git a/apps/remix-ide/ci/build_and_publish_docker_images.sh b/apps/remix-ide/ci/build_and_publish_docker_images.sh
index b51324fd77b..5f50eca5ad5 100755
--- a/apps/remix-ide/ci/build_and_publish_docker_images.sh
+++ b/apps/remix-ide/ci/build_and_publish_docker_images.sh
@@ -1,10 +1,11 @@
 #!/bin/bash
 set -e
 
-export TAG="$CIRCLE_BRANCH"
-
-if [ "$CIRCLE_BRANCH" == "master" ]; then
+if [ "$CIRCLE_BRANCH" == "master" ]; 
+then
     export TAG="latest";
+else
+    export TAG=$(sed 's/#/-/g' <<< $CIRCLE_BRANCH)
 fi
 
 docker login --username $DOCKER_USER --password $DOCKER_PASS