diff --git a/README.md b/README.md
index 3d8388a7..a1a2ed53 100644
--- a/README.md
+++ b/README.md
@@ -835,10 +835,10 @@ SOFTWARE.
 [example-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
 [example-armv7-shield]: https://img.shields.io/badge/armv7-yes-green.svg
 [example-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
-[addon-ftp]: https://github.com/hassio-addons/addon-ftp/tree/v3.2.0
-[addon-doc-ftp]: https://github.com/hassio-addons/addon-ftp/blob/v3.2.0/README.md
+[addon-ftp]: https://github.com/hassio-addons/addon-ftp/tree/v3.3.0
+[addon-doc-ftp]: https://github.com/hassio-addons/addon-ftp/blob/v3.3.0/README.md
 [ftp-issue]: https://github.com/hassio-addons/addon-ftp/issues
-[ftp-version-shield]: https://img.shields.io/badge/version-v3.2.0-blue.svg
+[ftp-version-shield]: https://img.shields.io/badge/version-v3.3.0-blue.svg
 [ftp-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/ftp-armhf.svg
 [ftp-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
 [ftp-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
diff --git a/ftp/CHANGELOG.md b/ftp/CHANGELOG.md
index 8f3d6faa..10e86c81 100644
--- a/ftp/CHANGELOG.md
+++ b/ftp/CHANGELOG.md
@@ -4,18 +4,14 @@ This is a general maintenance release.
 
 ### :hammer: Changes
 
-- :fireworks: Updates maintenance/license year to 2020
-- :pencil2: Funding adjustments
-- :pencil2: Fixes some spelling and grammar
-- :books: Adjust add-on installation instructions
-- :arrow_up: Upgrades add-on base image to v6.0.1
-- :arrow_up: Upgrades gcc to 9.2.0-r3
-- :arrow_up: Upgrades linux-pam-dev to 1.3.1-r1
-- :arrow_up: Upgrades musl-dev to 1.1.24-r0
-- :arrow_up: Upgrades openssl to 1.1.1d-r3
-- :pencil2: Fixes some spelling and grammar
+- :books: Update add-on documentation to use new YAML configuration format
+- :hammer: Update add-on config with new password & list features
+- :hammer: Re-branding
+- :arrow_up: Upgrades add-on base image to v7.0.2
+- :hammer: Update community forum links
+- :hammer: Don't use apk cache on cleanup
 
-[changelog]: https://github.com/hassio-addons/addon-ftp/compare/v3.1.1...v3.2.0
+[changelog]: https://github.com/hassio-addons/addon-ftp/compare/v3.2.0...v3.3.0
 
 Questions? Join our Discord server! https://discord.me/hassioaddons
 Enjoying my add-ons? Consider supporting my work:
diff --git a/ftp/README.md b/ftp/README.md
index 58e4a74b..6bc110f7 100644
--- a/ftp/README.md
+++ b/ftp/README.md
@@ -1,4 +1,4 @@
-# Community Hass.io Add-ons: FTP
+# Home Assistant Community Add-on: FTP
 
 [![Release][release-shield]][release] ![Project Stage][project-stage-shield] ![Project Maintenance][maintenance-shield]
 
@@ -8,7 +8,7 @@
 
 [![Support Frenck on Patreon][patreon-shield]][patreon]
 
-A secure and fast FTP server for Hass.io
+A secure and fast FTP server for Home Assistant
 
 ## About
 
@@ -28,14 +28,14 @@ access to your Home Assistant configuration via FTP.
 
 [discord-shield]: https://img.shields.io/discord/478094546522079232.svg
 [discord]: https://discord.me/hassioaddons
-[docs]: https://github.com/hassio-addons/addon-ftp/blob/v3.2.0/README.md
+[docs]: https://github.com/hassio-addons/addon-ftp/blob/v3.3.0/README.md
 [forum-shield]: https://img.shields.io/badge/community-forum-brightgreen.svg
-[forum]: https://community.home-assistant.io/t/community-hass-io-add-on-ftp/36799?u=frenck
+[forum]: https://community.home-assistant.io/t/home-assistant-community-add-on-ftp/36799?u=frenck
 [github-sponsors-shield]: https://frenck.dev/wp-content/uploads/2019/12/github_sponsor.png
 [github-sponsors]: https://github.com/sponsors/frenck
 [maintenance-shield]: https://img.shields.io/maintenance/yes/2020.svg
 [patreon-shield]: https://frenck.dev/wp-content/uploads/2019/12/patreon.png
 [patreon]: https://www.patreon.com/frenck
 [project-stage-shield]: https://img.shields.io/badge/project%20stage-production%20ready-brightgreen.svg
-[release-shield]: https://img.shields.io/badge/version-v3.2.0-blue.svg
-[release]: https://github.com/hassio-addons/addon-ftp/tree/v3.2.0
\ No newline at end of file
+[release-shield]: https://img.shields.io/badge/version-v3.3.0-blue.svg
+[release]: https://github.com/hassio-addons/addon-ftp/tree/v3.3.0
\ No newline at end of file
diff --git a/ftp/config.json b/ftp/config.json
index dd8b4ae1..c1d54245 100644
--- a/ftp/config.json
+++ b/ftp/config.json
@@ -1,8 +1,8 @@
 {
   "name": "FTP",
-  "version": "3.2.0",
+  "version": "3.3.0",
   "slug": "ftp",
-  "description": "A secure and fast FTP server for Hass.io",
+  "description": "A secure and fast FTP server for Home Assistant",
   "url": "https://github.com/hassio-addons/addon-ftp",
   "startup": "services",
   "arch": [
@@ -58,7 +58,7 @@
     ]
   },
   "schema": {
-    "log_level": "match(^(trace|debug|info|notice|warning|error|fatal)$)?",
+    "log_level": "list(trace|debug|info|notice|warning|error|fatal)?",
     "port": "port",
     "data_port": "port",
     "banner": "str",
@@ -74,7 +74,7 @@
     "users": [
       {
         "username": "match(^[a-zA-Z0-9\\d](?:[a-zA-Z0-9\\d]|-(?=[a-zA-Z0-9\\d])){0,32}$)",
-        "password": "str",
+        "password": "password",
         "allow_chmod": "bool",
         "allow_download": "bool",
         "allow_upload": "bool",