diff --git a/jjb/onos/onos-docker-build.sh b/jjb/onos/onos-docker-build.sh
index 7faccca..17a0777 100644
--- a/jjb/onos/onos-docker-build.sh
+++ b/jjb/onos/onos-docker-build.sh
@@ -19,6 +19,10 @@
   git checkout -b docker $ONOS_TAG
 fi
 
+if [[ $ONOS_TAG == "onos-"* ]]; then
+  ONOS_TAG=${ONOS_TAG#"onos-"}
+fi
+
 # build and deploy the Docker image
 $DOCKER build -t onosproject/onos:${ONOS_TAG} .
 $DOCKER login --username ${DOCKERHUB_USERNAME} --password ${DOCKERHUB_PASSWORD}