diff --git a/build/build-docker.sh b/build/build-docker.sh
index b6a9dede..38405f8f 100755
--- a/build/build-docker.sh
+++ b/build/build-docker.sh
@@ -19,12 +19,13 @@ build_arch() {
   local suffix="${5:-$arch}"
 
   echo -e "\e[1m\n[ Build NCP Docker ${arch} ]\e[0m"
+  version="${version?}"
   DOCKER_BUILDKIT=1 docker build --pull --progress=plain . -f build/docker/Dockerfile \
     --target "$target" -t "ownyourbits/$target-${suffix}:latest" \
     --cache-from "ownyourbits/nextcloudpi-${suffix}" --build-arg "release=$release" --build-arg "arch=${arch}" \
-    --build-arg "arch_qemu=$arch_qemu" --build-arg "ncp_ver=${version?}"
+    --build-arg "arch_qemu=$arch_qemu" --build-arg "ncp_ver=${version#docker-}"
 
-  docker tag "ownyourbits/${target}-${suffix}:latest" "ownyourbits/${target}-${suffix}:${version}"
+  docker tag "ownyourbits/${target}-${suffix}:latest" "ownyourbits/${target}-${suffix}:${version#docker-}"
 }
 
 get_arch_args() {
diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile
index 421f9ae7..84b0d6e1 100644
--- a/build/docker/Dockerfile
+++ b/build/docker/Dockerfile
@@ -213,7 +213,7 @@ rm -f /var/log/alternatives.log /var/log/apt/*; \
 rm /var/cache/debconf/*-old; \
 
 # set version
-echo "${ncp_ver}" > /usr/local/etc/ncp-version
+echo "${ncp_ver#docker-}" > /usr/local/etc/ncp-version
 
 COPY build/docker/nextcloudpi/000ncp /etc/services-enabled.d/