diff --git a/fireflyiii/CHANGELOG.md b/fireflyiii/CHANGELOG.md
index b5debdcfc..56776ca0d 100644
--- a/fireflyiii/CHANGELOG.md
+++ b/fireflyiii/CHANGELOG.md
@@ -1,4 +1,7 @@
 
+## 6.0.0 (04-03-2023)
+- Update to latest version from firefly-iii/firefly-iii
+
 ## 5.7.18 (07-01-2023)
 - Update to latest version from firefly-iii/firefly-iii
 
diff --git a/fireflyiii/Dockerfile b/fireflyiii/Dockerfile
index d7f8de4f9..077efb557 100644
--- a/fireflyiii/Dockerfile
+++ b/fireflyiii/Dockerfile
@@ -33,12 +33,12 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
 #    # Change data location
 #    grep -rl "/var/www/html" /etc/ | xargs sed -i 's|/var/www/html|/data/firefly|g'
 
-ARG BUILD_UPSTREAM="5.7.18"
+ARG BUILD_UPSTREAM="6.0.0"
 RUN \
     #################
     # Fix for 5.7.5 #
     #################
-    if [ "$BUILD_UPSTREAM" = "5.7.18" ] ; then \
+    if [ "$BUILD_UPSTREAM" = "6.0.0" ] ; then \
     sed -i "s|, \$transaction\[\x27amount\x27\] ?? \x270\x27);|, (string)(\$transaction\[\x27amount\x27\] ?? \x270\x27));|g" /var/www/html/app/Helpers/Collector/GroupCollector.php; else echo "not 5.7.5"; fi
 RUN \
     # Change upload folder to "ha_upload" since the default one is binded to a volume (see base image)
diff --git a/fireflyiii/config.json b/fireflyiii/config.json
index 556388e88..885c5f350 100644
--- a/fireflyiii/config.json
+++ b/fireflyiii/config.json
@@ -47,6 +47,6 @@
   "slug": "fireflyiii",
   "startup": "services",
   "url": "https://github.com/alexbelgium/hassio-addons",
-  "version": "5.7.18",
+  "version": "6.0.0",
   "webui": "[PROTO:ssl]://[HOST]:[PORT:8080]"
 }
diff --git a/fireflyiii/updater.json b/fireflyiii/updater.json
index 14ba3905d..2af021e06 100644
--- a/fireflyiii/updater.json
+++ b/fireflyiii/updater.json
@@ -1,8 +1,8 @@
 {
-  "last_update": "07-01-2023",
+  "last_update": "04-03-2023",
   "repository": "alexbelgium/hassio-addons",
   "slug": "fireflyiii",
   "source": "github",
   "upstream_repo": "firefly-iii/firefly-iii",
-  "upstream_version": "5.7.18"
+  "upstream_version": "6.0.0"
 }