diff --git a/Dockerfile.dev b/Dockerfile.dev
index d7ba9cb20..675811b58 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -1,11 +1,14 @@
-FROM minio/minio:edge
+FROM minio/minio
 
 LABEL maintainer="MinIO Inc <dev@min.io>"
 
-COPY minio /usr/bin/
+ENV PATH=/opt/bin:$PATH
+
+COPY minio /opt/bin
 COPY dockerscripts/docker-entrypoint.sh /usr/bin/
 
-RUN chmod +x /usr/bin/minio && \
+RUN mkdir -p /opt/bin && chmod -R 777 /opt/bin && \
+    chmod +x /opt/bin/minio && \
     chmod +x /usr/bin/docker-entrypoint.sh
 
 EXPOSE 9000
diff --git a/Dockerfile.release b/Dockerfile.release
index 7b5cbe346..39f9e48cf 100644
--- a/Dockerfile.release
+++ b/Dockerfile.release
@@ -19,7 +19,7 @@ ENV MINIO_ACCESS_KEY_FILE=access_key \
     MINIO_KMS_SECRET_KEY_FILE=kms_master_key \
     MINIO_UPDATE_MINISIGN_PUBKEY="RWTx5Zr1tiHQLwG9keckT0c45M3AGeHD6IvimQHpyRywVWGbP1aVSGav" \
     MINIO_CONFIG_ENV_FILE=config.env \
-    PATH=$PATH:/opt/bin
+    PATH=/opt/bin:$PATH
 
 COPY dockerscripts/verify-minio.sh /usr/bin/verify-minio.sh
 COPY dockerscripts/docker-entrypoint.sh /usr/bin/docker-entrypoint.sh
diff --git a/Dockerfile.release.fips b/Dockerfile.release.fips
index aee2cfc33..70e692b6a 100644
--- a/Dockerfile.release.fips
+++ b/Dockerfile.release.fips
@@ -19,7 +19,7 @@ ENV MINIO_ACCESS_KEY_FILE=access_key \
     MINIO_KMS_SECRET_KEY_FILE=kms_master_key \
     MINIO_UPDATE_MINISIGN_PUBKEY="RWTx5Zr1tiHQLwG9keckT0c45M3AGeHD6IvimQHpyRywVWGbP1aVSGav" \
     MINIO_CONFIG_ENV_FILE=config.env \
-    PATH=$PATH:/opt/bin
+    PATH=/opt/bin:$PATH
 
 COPY dockerscripts/verify-minio.sh /usr/bin/verify-minio.sh
 COPY dockerscripts/docker-entrypoint.sh /usr/bin/docker-entrypoint.sh