diff --git a/Dockerfile b/Dockerfile
index 42b5c5b..9bff009 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -39,9 +39,8 @@ ENV \
     JCLOUDS_CREDENTIAL="remote-credential" \
     JCLOUDS_KEYSTONE_VERSION="" \
     JCLOUDS_KEYSTONE_SCOPE="" \
-    JCLOUDS_KEYSTONE_PROJECT_DOMAIN_NAME=""
+    JCLOUDS_KEYSTONE_PROJECT_DOMAIN_NAME="" \
+    JCLOUDS_FILESYSTEM_BASEDIR="/data"
 
 EXPOSE 80
-VOLUME /data
-
 ENTRYPOINT ["/opt/s3proxy/run-docker-container.sh"]
diff --git a/src/main/resources/run-docker-container.sh b/src/main/resources/run-docker-container.sh
index f0412af..a162347 100755
--- a/src/main/resources/run-docker-container.sh
+++ b/src/main/resources/run-docker-container.sh
@@ -21,6 +21,6 @@ exec java \
     -Djclouds.keystone.version="${JCLOUDS_KEYSTONE_VERSION}" \
     -Djclouds.keystone.scope="${JCLOUDS_KEYSTONE_SCOPE}" \
     -Djclouds.keystone.project-domain-name="${JCLOUDS_KEYSTONE_PROJECT_DOMAIN_NAME}" \
-    -Djclouds.filesystem.basedir="/data" \
+    -Djclouds.filesystem.basedir="${JCLOUDS_FILESYSTEM_BASEDIR}" \
     -jar /opt/s3proxy/s3proxy \
     --properties /dev/null