diff --git a/scripts/core.sh b/scripts/core.sh
index 56f0613..38827b4 100755
--- a/scripts/core.sh
+++ b/scripts/core.sh
@@ -116,11 +116,6 @@ if [[ $SELECTED_MODES -ne 1 ]]; then
     usage
 fi
 
-if [[ $AUTOTAG -eq 1 ]]; then
-    TAG=`./next-ver.sh -${TAG_OPTS}`
-    echo "Using tag $TAG"
-fi
-
 ./aws-login.sh
 
 if  [[ $UNIT_MODE -eq 1 ]]; then 
@@ -137,6 +132,10 @@ if  [[ $UNIT_MODE -eq 1 ]]; then
 fi
 
 if  [[ $PUBLISH_MODE -eq 1 ]]; then 
+    if [[ $AUTOTAG -eq 1 ]]; then
+        TAG=`./next-ver.sh -${TAG_OPTS}`
+        echo "Using tag $TAG"
+    fi
     BUILDOPT+="bu"
     VERBOPT=""
     if [[ $VERBOSE -gt 0 ]]; then