diff --git a/README.md b/README.md
index 4be5d8a5..243c5612 100644
--- a/README.md
+++ b/README.md
@@ -70,8 +70,8 @@ Networking changed in Docker v1.9, so you need to do one of the following steps.
    ```bash
    docker run -d --link bookstack_db_:mysql \
    -p 8080:8080 \
-   --name bookstack_24.12.1 \
-   solidnerd/bookstack:24.12.1
+   --name bookstack_25.2.0 \
+   solidnerd/bookstack:25.2.0
    ```
 
 ### Docker 1.9+
@@ -104,8 +104,8 @@ Networking changed in Docker v1.9, so you need to do one of the following steps.
    -e DB_PASSWORD=secret \
    -e APP_URL=http://example.com \
    -p 8080:8080 \
-   --name="bookstack_24.12.1" \
-    solidnerd/bookstack:24.12.1
+   --name="bookstack_25.2.0" \
+    solidnerd/bookstack:25.2.0
    ```
 
     The APP_URL parameter should be the base URL for your BookStack instance without
diff --git a/VERSION b/VERSION
index 58dde6ec..baa90a68 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-24.12.1
+25.2.0
diff --git a/docker-compose.yml b/docker-compose.yml
index 1f6c903d..1b44083b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,7 +11,7 @@ services:
     - mysql-data:/var/lib/mysql
 
   bookstack:
-    image: solidnerd/bookstack:24.12.1
+    image: solidnerd/bookstack:25.2.0
     depends_on:
     - mysql
     environment:
diff --git a/scripts/update_tags_and_docs.sh b/scripts/update_tags_and_docs.sh
index 063dd073..51c8edec 100755
--- a/scripts/update_tags_and_docs.sh
+++ b/scripts/update_tags_and_docs.sh
@@ -16,7 +16,7 @@ echo "Extracted version: ${BOOKSTACK_VERSION}"
 # Remove the 'v' for our tags
 BOOKSTACK_VERSION="${BOOKSTACK_VERSION/#v/}"
 # Remove leading zeros to make the version fit a SemVer-shaped hole
-BOOKSTACK_VERSION="${BOOKSTACK_VERSION//.0?/.}"
+BOOKSTACK_VERSION="${BOOKSTACK_VERSION/.0/.}"
 
 # If the version only has one decimal dot in it, it doesn't have a patch
 # version and one should be added to ensure semver-shape.
@@ -27,6 +27,13 @@ fi
 
 echo "Tag name: ${BOOKSTACK_VERSION}"
 
+read -p "Is the tag name correct? (y/n)" -n 1 -r
+echo
+if ! [[ "${REPLY}" =~ ^[Yy]$ ]]; then
+  echo "Aborting.."
+  exit 1
+fi
+
 git tag -s -a "${BOOKSTACK_VERSION}" -m "Release version ${BOOKSTACK_VERSION}"
 git push --tags