diff --git a/.test/tests/valkey-basics-persistent/run.sh b/.test/tests/valkey-basics-persistent/run.sh
index b2bfc44..9c0a05d 100755
--- a/.test/tests/valkey-basics-persistent/run.sh
+++ b/.test/tests/valkey-basics-persistent/run.sh
@@ -13,6 +13,13 @@ cid="$(docker run -d --name "$cname" --network "$network" "$image")"
 
 trap "docker rm -vf '$cid' >/dev/null; docker network rm '$network' >/dev/null" EXIT
 
+# Verify /data is not configured as a Docker volume
+volumes="$(docker inspect "$cname" --format '{{range .Mounts}}{{.Destination}} {{end}}')"
+if echo "$volumes" | grep -q "/data"; then
+  echo >&2 "ERROR: /data should not be a volume mount point"
+  exit 1
+fi
+
 valkey-cli() {
   docker run --rm -i \
     --network "$network" \
diff --git a/7.2/alpine/Dockerfile b/7.2/alpine/Dockerfile
index 48944dc..2037f9d 100644
--- a/7.2/alpine/Dockerfile
+++ b/7.2/alpine/Dockerfile
@@ -100,7 +100,6 @@ RUN mkdir /data && \
 	chown valkey:valkey /run/valkey && \
 	valkey-cli --version && \
 	valkey-server --version
-VOLUME /data
 WORKDIR /data
 
 COPY docker-entrypoint.sh /usr/local/bin/
diff --git a/7.2/debian/Dockerfile b/7.2/debian/Dockerfile
index f6f45f8..d443883 100644
--- a/7.2/debian/Dockerfile
+++ b/7.2/debian/Dockerfile
@@ -98,7 +98,6 @@ RUN mkdir /data && \
 	chown valkey:valkey /run/valkey && \
 	valkey-cli --version && \
 	valkey-server --version
-VOLUME /data
 WORKDIR /data
 
 COPY docker-entrypoint.sh /usr/local/bin/
diff --git a/8.0/alpine/Dockerfile b/8.0/alpine/Dockerfile
index 039bccd..436714b 100644
--- a/8.0/alpine/Dockerfile
+++ b/8.0/alpine/Dockerfile
@@ -100,7 +100,6 @@ RUN mkdir /data && \
 	chown valkey:valkey /run/valkey && \
 	valkey-cli --version && \
 	valkey-server --version
-VOLUME /data
 WORKDIR /data
 
 COPY docker-entrypoint.sh /usr/local/bin/
diff --git a/8.0/debian/Dockerfile b/8.0/debian/Dockerfile
index 26dd28c..225ef42 100644
--- a/8.0/debian/Dockerfile
+++ b/8.0/debian/Dockerfile
@@ -98,7 +98,6 @@ RUN mkdir /data && \
 	chown valkey:valkey /run/valkey && \
 	valkey-cli --version && \
 	valkey-server --version
-VOLUME /data
 WORKDIR /data
 
 COPY docker-entrypoint.sh /usr/local/bin/
diff --git a/8.1/alpine/Dockerfile b/8.1/alpine/Dockerfile
index 18a830f..7a2ad15 100644
--- a/8.1/alpine/Dockerfile
+++ b/8.1/alpine/Dockerfile
@@ -101,7 +101,6 @@ RUN mkdir /data && \
 	chown valkey:valkey /run/valkey && \
 	valkey-cli --version && \
 	valkey-server --version
-VOLUME /data
 WORKDIR /data
 
 COPY docker-entrypoint.sh /usr/local/bin/
diff --git a/8.1/debian/Dockerfile b/8.1/debian/Dockerfile
index 488f535..0b01e2d 100644
--- a/8.1/debian/Dockerfile
+++ b/8.1/debian/Dockerfile
@@ -102,7 +102,6 @@ RUN mkdir /data && \
 	chown valkey:valkey /run/valkey && \
 	valkey-cli --version && \
 	valkey-server --version
-VOLUME /data
 WORKDIR /data
 
 COPY docker-entrypoint.sh /usr/local/bin/
diff --git a/9.0/alpine/Dockerfile b/9.0/alpine/Dockerfile
index 548d5f2..eea13e8 100644
--- a/9.0/alpine/Dockerfile
+++ b/9.0/alpine/Dockerfile
@@ -101,7 +101,6 @@ RUN mkdir /data && \
 	chown valkey:valkey /run/valkey && \
 	valkey-cli --version && \
 	valkey-server --version
-VOLUME /data
 WORKDIR /data
 
 COPY docker-entrypoint.sh /usr/local/bin/
diff --git a/9.0/debian/Dockerfile b/9.0/debian/Dockerfile
index b575a87..75f33a0 100644
--- a/9.0/debian/Dockerfile
+++ b/9.0/debian/Dockerfile
@@ -102,7 +102,6 @@ RUN mkdir /data && \
 	chown valkey:valkey /run/valkey && \
 	valkey-cli --version && \
 	valkey-server --version
-VOLUME /data
 WORKDIR /data
 
 COPY docker-entrypoint.sh /usr/local/bin/
diff --git a/Dockerfile.template b/Dockerfile.template
index e175fd3..1a2233a 100644
--- a/Dockerfile.template
+++ b/Dockerfile.template
@@ -178,7 +178,6 @@ RUN mkdir /data && \
 	chown valkey:valkey /run/valkey && \
 	valkey-cli --version && \
 	valkey-server --version
-VOLUME /data
 WORKDIR /data
 
 COPY docker-entrypoint.sh /usr/local/bin/
diff --git a/dockerhub-description-template.md b/dockerhub-description-template.md
index dd35014..c5f7865 100644
--- a/dockerhub-description-template.md
+++ b/dockerhub-description-template.md
@@ -1,6 +1,3 @@
-## This file is auto-generated by the [Valkey-Release-Automation](https://github.com/valkey-io/valkey-release-automation/blob/main/.github/workflows/update-docker.yml) repository
-Last updated: {update_date}
-
 # Quick reference
 
 -	**Maintained by**:
@@ -41,7 +38,7 @@ $ docker run --name some-valkey -d valkey/valkey
 $ docker run --name some-valkey -d valkey/valkey valkey-server --save 60 1 --loglevel warning
 ```
 
-There are several different persistence strategies to choose from. This one will save a snapshot of the DB every 60 seconds if at least 1 write operation was performed (it will also lead to more logs, so the `loglevel` option may be desirable). If persistence is enabled, data is stored in the `VOLUME /data`, which can be used with `--volumes-from some-volume-container` or `-v /docker/host/dir:/data` (see [docs.docker volumes](https://docs.docker.com/engine/tutorials/dockervolumes/)).
+There are several different persistence strategies to choose from. This one will save a snapshot of the DB every 60 seconds if at least 1 write operation was performed (it will also lead to more logs, so the `loglevel` option may be desirable). If persistence is enabled, data is stored in the `/data` directory, which can be mounted using `-v /docker/host/dir:/data` (see [docs.docker volumes](https://docs.docker.com/engine/tutorials/dockervolumes/)).
 
 ## Connecting via `valkey-cli`
 
diff --git a/dockerhub-description.md b/dockerhub-description.md
index 00136a8..e48829d 100644
--- a/dockerhub-description.md
+++ b/dockerhub-description.md
@@ -51,7 +51,7 @@ $ docker run --name some-valkey -d valkey/valkey
 $ docker run --name some-valkey -d valkey/valkey valkey-server --save 60 1 --loglevel warning
 ```
 
-There are several different persistence strategies to choose from. This one will save a snapshot of the DB every 60 seconds if at least 1 write operation was performed (it will also lead to more logs, so the `loglevel` option may be desirable). If persistence is enabled, data is stored in the `VOLUME /data`, which can be used with `--volumes-from some-volume-container` or `-v /docker/host/dir:/data` (see [docs.docker volumes](https://docs.docker.com/engine/tutorials/dockervolumes/)).
+There are several different persistence strategies to choose from. This one will save a snapshot of the DB every 60 seconds if at least 1 write operation was performed (it will also lead to more logs, so the `loglevel` option may be desirable). If persistence is enabled, data is stored in the `/data` directory, which can be mounted using `-v /docker/host/dir:/data` (see [docs.docker volumes](https://docs.docker.com/engine/tutorials/dockervolumes/)).
 
 ## Connecting via `valkey-cli`
 
diff --git a/unstable/alpine/Dockerfile b/unstable/alpine/Dockerfile
index 1d7e49a..7eb0735 100644
--- a/unstable/alpine/Dockerfile
+++ b/unstable/alpine/Dockerfile
@@ -101,7 +101,6 @@ RUN mkdir /data && \
 	chown valkey:valkey /run/valkey && \
 	valkey-cli --version && \
 	valkey-server --version
-VOLUME /data
 WORKDIR /data
 
 COPY docker-entrypoint.sh /usr/local/bin/
diff --git a/unstable/debian/Dockerfile b/unstable/debian/Dockerfile
index 6463642..fcd498b 100644
--- a/unstable/debian/Dockerfile
+++ b/unstable/debian/Dockerfile
@@ -102,7 +102,6 @@ RUN mkdir /data && \
 	chown valkey:valkey /run/valkey && \
 	valkey-cli --version && \
 	valkey-server --version
-VOLUME /data
 WORKDIR /data
 
 COPY docker-entrypoint.sh /usr/local/bin/