diff --git a/.docker/alpine/Dockerfile.prebuild b/.docker/alpine/Dockerfile.prebuild
index d694e80c..05aee8cb 100644
--- a/.docker/alpine/Dockerfile.prebuild
+++ b/.docker/alpine/Dockerfile.prebuild
@@ -53,11 +53,14 @@ RUN if [ -n "$VERSION" ]; then \
             *) echo "Unsupported architecture: ${TARGETARCH}" && exit 1 ;; \
         esac; \
         \
-        # Determine download path and filename
-        if [ "${BUILD_TYPE}" = "development" ]; then \
+        # Handle VERSION with potential dev- prefix using variable expansion
+        if [[ "$VERSION" == dev-* ]]; then \
+            # Remove dev- prefix if present
+            CLEAN_VERSION="${VERSION#dev-}"; \
             DOWNLOAD_PATH="artifacts/rustfs/dev"; \
-            FILENAME="rustfs-linux-${ARCH}-dev-${VERSION}.zip"; \
+            FILENAME="rustfs-linux-${ARCH}-dev-${CLEAN_VERSION}.zip"; \
         else \
+            # VERSION is a release version
             DOWNLOAD_PATH="artifacts/rustfs/release"; \
             FILENAME="rustfs-linux-${ARCH}-v${VERSION}.zip"; \
         fi; \
diff --git a/.docker/ubuntu/Dockerfile.prebuild b/.docker/ubuntu/Dockerfile.prebuild
index f54af613..ee9db6c9 100644
--- a/.docker/ubuntu/Dockerfile.prebuild
+++ b/.docker/ubuntu/Dockerfile.prebuild
@@ -73,11 +73,14 @@ RUN if [ -n "$VERSION" ]; then \
             *) echo "Unsupported architecture: ${TARGETARCH}" && exit 1 ;; \
         esac; \
         \
-        # Determine download path and filename
-        if [ "${BUILD_TYPE}" = "development" ]; then \
+        # Handle VERSION with potential dev- prefix using variable expansion
+        if [[ "$VERSION" == dev-* ]]; then \
+            # Remove dev- prefix if present
+            CLEAN_VERSION="${VERSION#dev-}"; \
             DOWNLOAD_PATH="artifacts/rustfs/dev"; \
-            FILENAME="rustfs-linux-${ARCH}-dev-${VERSION}.zip"; \
+            FILENAME="rustfs-linux-${ARCH}-dev-${CLEAN_VERSION}.zip"; \
         else \
+            # VERSION is a release version
             DOWNLOAD_PATH="artifacts/rustfs/release"; \
             FILENAME="rustfs-linux-${ARCH}-v${VERSION}.zip"; \
         fi; \
diff --git a/Dockerfile b/Dockerfile
index 63f8e89d..a235d8e0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -53,11 +53,14 @@ RUN if [ -n "$VERSION" ]; then \
             *) echo "Unsupported architecture: ${TARGETARCH}" && exit 1 ;; \
         esac; \
         \
-        # Determine download path and filename
-        if [ "${BUILD_TYPE}" = "development" ]; then \
+        # Handle VERSION with potential dev- prefix using variable expansion
+        if [[ "$VERSION" == dev-* ]]; then \
+            # Remove dev- prefix if present
+            CLEAN_VERSION="${VERSION#dev-}"; \
             DOWNLOAD_PATH="artifacts/rustfs/dev"; \
-            FILENAME="rustfs-linux-${ARCH}-dev-${VERSION}.zip"; \
+            FILENAME="rustfs-linux-${ARCH}-dev-${CLEAN_VERSION}.zip"; \
         else \
+            # VERSION is a release version
             DOWNLOAD_PATH="artifacts/rustfs/release"; \
             FILENAME="rustfs-linux-${ARCH}-v${VERSION}.zip"; \
         fi; \