diff --git a/README.md b/README.md
index c512bc97..880421c9 100644
--- a/README.md
+++ b/README.md
@@ -981,10 +981,10 @@ SOFTWARE.
 [nginxproxymanager-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
 [nginxproxymanager-armv7-shield]: https://img.shields.io/badge/armv7-yes-green.svg
 [nginxproxymanager-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
-[addon-node-red]: https://github.com/hassio-addons/addon-node-red/tree/v6.0.4
-[addon-doc-node-red]: https://github.com/hassio-addons/addon-node-red/blob/v6.0.4/README.md
+[addon-node-red]: https://github.com/hassio-addons/addon-node-red/tree/v6.1.0
+[addon-doc-node-red]: https://github.com/hassio-addons/addon-node-red/blob/v6.1.0/README.md
 [node-red-issue]: https://github.com/hassio-addons/addon-node-red/issues
-[node-red-version-shield]: https://img.shields.io/badge/version-v6.0.4-blue.svg
+[node-red-version-shield]: https://img.shields.io/badge/version-v6.1.0-blue.svg
 [node-red-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/node-red-armhf.svg
 [node-red-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
 [node-red-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
diff --git a/node-red/CHANGELOG.md b/node-red/CHANGELOG.md
index 1af0ca47..16de8a7f 100644
--- a/node-red/CHANGELOG.md
+++ b/node-red/CHANGELOG.md
@@ -4,10 +4,25 @@ This is a general maintenance release.
 
 ### 🔨  Changes
 
-- :arrow_up: Updates node-red-node-email to v1.7.6 (#435)
-- :ambulance: node-red/package.json to reduce vulnerabilities (#436)
+- :arrow_up: Updates node-red-dashboard to v2.19.4 (#441)
+- :hammer: Re-branding
+- :hammer: Update add-on with latest Supervisor changes
+- :hammer: Update add-on config with new password & list features
+- :books: Update add-on documentation to use new YAML configuration format
+- :arrow_up: Upgrades npm to 12.15.0-r1
+- :arrow_up: Updates node-red-node-email to v1.7.7 (#443)
+- :hammer: Re-branding
+- :shirt: Improve indenting in NGINX configuration
+- :arrow_up: Updates node-red-contrib-theme-midnight-red to v1.0.29 (#456)
+- :arrow_up: Upgrades add-on base image to v7.0.2
+- :hammer: Update community forum links
+- :arrow_up: Updates node-red-contrib-home-assistant-websocket to v0.20.2 (#448)
+- :arrow_up: Updates snyk to v1.296.0 (#447)
+- :arrow_up: Updates node-red-contrib-cast to v0.2.14 (#449)
+- :hammer: Update flows.json to use addon property (#451)
+- :ambulance: Add migration script for upstream breaking change
 
-[changelog]: https://github.com/hassio-addons/addon-node-red/compare/v6.0.3...v6.0.4
+[changelog]: https://github.com/hassio-addons/addon-node-red/compare/v6.0.4...v6.1.0
 
 Questions? Join our Discord server! https://discord.me/hassioaddons
 Enjoying my add-ons? Consider supporting my work:
diff --git a/node-red/README.md b/node-red/README.md
index e56d69f6..54e05bda 100644
--- a/node-red/README.md
+++ b/node-red/README.md
@@ -1,4 +1,4 @@
-# Community Hass.io Add-ons: Node-RED
+# Home Assistant Community Add-on: Node-RED
 
 [![Release][release-shield]][release] ![Project Stage][project-stage-shield] ![Project Maintenance][maintenance-shield]
 
@@ -25,7 +25,7 @@ runtime in a single click.
 
 ## WARNING! THIS IS A BETA VERSION!
 
-This Hass.io Add-ons repository contains beta releases of add-ons.
+This Home Assistant Add-ons repository contains beta releases of add-ons.
 
 - They might stop working at any time.
 - They could have a negative impact on your system.
@@ -41,15 +41,15 @@ If you are more interested in stable releases of our add-ons:
 
 [discord-shield]: https://img.shields.io/discord/478094546522079232.svg
 [discord]: https://discord.me/hassioaddons
-[docs]: https://github.com/hassio-addons/addon-node-red/blob/v6.0.4/README.md
+[docs]: https://github.com/hassio-addons/addon-node-red/blob/v6.1.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-node-red/55023?u=frenck
+[forum]: https://community.home-assistant.io/t/home-assistant-community-add-on-node-red/55023?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-v6.0.4-blue.svg
-[release]: https://github.com/hassio-addons/addon-node-red/tree/v6.0.4
+[release-shield]: https://img.shields.io/badge/version-v6.1.0-blue.svg
+[release]: https://github.com/hassio-addons/addon-node-red/tree/v6.1.0
 [screenshot]: https://github.com/hassio-addons/addon-node-red/raw/master/images/screenshot.png
\ No newline at end of file
diff --git a/node-red/config.json b/node-red/config.json
index 87dfecf6..fb98c85d 100644
--- a/node-red/config.json
+++ b/node-red/config.json
@@ -1,6 +1,6 @@
 {
   "name": "Node-RED",
-  "version": "6.0.4",
+  "version": "6.1.0",
   "slug": "nodered",
   "description": "Flow-based programming for the Internet of Things",
   "url": "https://github.com/hassio-addons/addon-node-red",
@@ -63,16 +63,16 @@
     "init_commands": []
   },
   "schema": {
-    "log_level": "match(^(trace|debug|info|notice|warning|error|fatal)$)?",
-    "credential_secret": "str",
+    "log_level": "list(trace|debug|info|notice|warning|error|fatal)?",
+    "credential_secret": "password",
     "dark_mode": "bool",
     "http_node": {
       "username": "str",
-      "password": "str"
+      "password": "password"
     },
     "http_static": {
       "username": "str",
-      "password": "str"
+      "password": "password"
     },
     "ssl": "bool",
     "certfile": "str",