diff --git a/firefly_iii/Dockerfile b/firefly_iii/Dockerfile
index 0997a52a6..6ba05707c 100644
--- a/firefly_iii/Dockerfile
+++ b/firefly_iii/Dockerfile
@@ -21,7 +21,7 @@ FROM ${BUILD_FROM}
 # 2 Modify Image #
 ##################
 
-ENV FIREFLY_III_PATH="/data/firefly"
+#ENV FIREFLY_III_PATH="/data/firefly"
 #WORKDIR $FIREFLY_III_PATH
 #RUN \
 #    # Change data location
diff --git a/firefly_iii/rootfs/scripts/99-run.sh b/firefly_iii/rootfs/scripts/99-run.sh
index f2ef130f5..242c337c9 100644
--- a/firefly_iii/rootfs/scripts/99-run.sh
+++ b/firefly_iii/rootfs/scripts/99-run.sh
@@ -29,11 +29,11 @@ sqlite_internal)
     export DB_CONNECTION=sqlite
     # Creating database
     mkdir -p /config/addons_config/fireflyiii/database
-    touch /config/addons_config/fireflyiii/database/database.sqlite
-    chmod 777 /config/addons_config/fireflyiii/database/database.sqlite
-    # Symlink
     rm -r /var/www/html/storage/database
     ln -snf /config/addons_config/fireflyiii/database /var/www/html/storage
+    chown -R $(id -u):$(id -g) /var/www/html/storage/database
+    chmod 755 /var/www/html/storage/database
+    touch /var/www/html/storage/database/database.sqlite
     ;;
 
 # Use MariaDB