diff --git a/firefly_iii/Dockerfile b/firefly_iii/Dockerfile
index 31774e3b7..84e075642 100644
--- a/firefly_iii/Dockerfile
+++ b/firefly_iii/Dockerfile
@@ -21,7 +21,12 @@ 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
+    grep -rl "/var/www/html" /etc/ | xargs sed -i 's|/var/www/html|/data/firefly|g'
+
 
 ##################
 # 3 Install apps #
diff --git a/firefly_iii/config.json b/firefly_iii/config.json
index a4fbc839e..1d85b0c89 100644
--- a/firefly_iii/config.json
+++ b/firefly_iii/config.json
@@ -32,8 +32,8 @@
   },
   "slug": "fireflyiii",
   "services": ["mysql:want"],
-  "upstream": "1.4",
+  "upstream": "1.5",
   "url": "https://github.com/alexbelgium/hassio-addons",
-  "version": "1.4",
+  "version": "1.5",
   "webui": "[PROTO:ssl]://[HOST]:[PORT:8080]"
 }
diff --git a/firefly_iii/rootfs/scripts/20-folders.sh b/firefly_iii/rootfs/scripts/20-folders.sh
index 4bc5793a3..c81026609 100644
--- a/firefly_iii/rootfs/scripts/20-folders.sh
+++ b/firefly_iii/rootfs/scripts/20-folders.sh
@@ -1,9 +1,7 @@
 #!/usr/bin/env bashio
 
-echo "Connecting database to /config/addons_config/fireflyiii"
-
 # Create directory
-mkdir -p /config/addons_config/fireflyiii/storage
+mkdir -p /config/addons_config/fireflyiii
 
 # Make sure permissions are right
 chown -R $(id -u):$(id -g) /config/addons_config/fireflyiii
diff --git a/firefly_iii/rootfs/scripts/99-run.sh b/firefly_iii/rootfs/scripts/99-run.sh
index edb887a9e..0deeead49 100644
--- a/firefly_iii/rootfs/scripts/99-run.sh
+++ b/firefly_iii/rootfs/scripts/99-run.sh
@@ -1,10 +1,15 @@
 #!/usr/bin/env bashio
 
-bashio::log.info "Launching app"
+########
+# Init #
+########
 
-#######################
-# Backup APP_KEY file #
-#######################
+# Change data location
+echo "Update data location"
+mkdir -p /data/fireflyiii
+cp -rn /var/www/html /data/fireflyiii
+
+# Backup APP_KEY file
 bashio::log.info "Backuping APP_KEY to /config/addons_config/fireflyiii/APP_KEY_BACKUP.txt"
 APP_KEY="$(bashio::config 'APP_KEY')"
 echo "$APP_KEY" >/config/addons_config/fireflyiii/APP_KEY_BACKUP.txt