diff --git a/ToolboxStack/output/toolbox-base/release.sh b/ToolboxStack/output/toolbox-base/release.sh
index 0f3eaa3..792727a 100755
--- a/ToolboxStack/output/toolbox-base/release.sh
+++ b/ToolboxStack/output/toolbox-base/release.sh
@@ -10,12 +10,9 @@ Examples:
   ./release.sh 0.2.0
   ./release.sh --dry-run 0.2.0
 
-This script rebuilds the toolbox-base image, tags it as:
-  - tsysdevstack-toolboxstack-toolbox-base:dev
+This script promotes the dev tag to:
   - tsysdevstack-toolboxstack-toolbox-base:release-current
   - tsysdevstack-toolboxstack-toolbox-base:v<semver>
-
-When run without --dry-run it pushes all three tags.
 EOU
 }
 
@@ -78,13 +75,26 @@ echo "Preparing release for ${SEMVER}"
 echo "  dry-run: ${DRY_RUN}"
 echo "  allow-dirty: ${ALLOW_DIRTY}"
 
+# First, ensure we have the dev tag built
 if [[ "${DRY_RUN}" == "true" ]]; then
-    VERSION_TAG_OVERRIDE="${SEMVER}" PUSH_OVERRIDE=false "${SCRIPT_DIR}/build.sh"
-    echo "[dry-run] Skipped pushing tags."
+    echo "[dry-run] Would build dev tag"
 else
-    VERSION_TAG_OVERRIDE="${SEMVER}" PUSH_OVERRIDE=true "${SCRIPT_DIR}/build.sh"
-    echo "Release ${SEMVER} pushed as:"
-    echo "  - tsysdevstack-toolboxstack-toolbox-base:dev"
+    echo "Building dev tag..."
+    "${SCRIPT_DIR}/build.sh"
+fi
+
+# Tag the dev image as release-current and with the version
+IMAGE_NAME="tsysdevstack-toolboxstack-toolbox-base"
+
+if [[ "${DRY_RUN}" == "true" ]]; then
+    echo "[dry-run] Would tag ${IMAGE_NAME}:dev as:"
+    echo "  - ${IMAGE_NAME}:release-current"
+    echo "  - ${IMAGE_NAME}:${SEMVER}"
+else
+    echo "Tagging ${IMAGE_NAME}:dev as release-current and ${SEMVER}..."
+    docker tag "${IMAGE_NAME}:dev" "${IMAGE_NAME}:release-current"
+    docker tag "${IMAGE_NAME}:dev" "${IMAGE_NAME}:${SEMVER}"
+    echo "Release ${SEMVER} tagged as:"
     echo "  - tsysdevstack-toolboxstack-toolbox-base:release-current"
     echo "  - tsysdevstack-toolboxstack-toolbox-base:${SEMVER}"
 fi