diff --git a/.github/settings.yml b/.github/settings.yml
index 2bf9f75..98757a9 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -1,8 +1,8 @@
 ---
 repository:
-  description: "Grocy - Community Hass.io Add-on for Home Assistant"
+  description: "Grocy - Community Home Assistant Add-ons"
   homepage: https://addons.community
-  topics: groceries, food, erp, grocy, hassio-addons, hassio, hass, home-assistant, homeassistant
+  topics: groceries, food, erp, grocy, addon, addons, home-assistant, homeassistant
   private: false
   has_issues: true
   has_projects: false
diff --git a/README.md b/README.md
index 261a3f2..e2f1777 100755
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Community Hass.io Add-ons: Grocy
+# Community Home Assistant Add-on: Grocy
 
 [![GitHub Release][releases-shield]][releases]
 ![Project Stage][project-stage-shield]
@@ -43,9 +43,9 @@ management solution for your home, delivering features like:
 ## Installation
 
 The installation of this add-on is pretty straightforward and not different in
-comparison to installing any other Hass.io add-on.
+comparison to installing any other Home Assistant add-on.
 
-1. Search for the "Grocy" add-on in the Hass.io add-on store.
+1. Search for the "Grocy" add-on in the Supervisor add-on store.
 1. Install the "Grocy" add-on.
 1. Start the "Grocy" add-on.
 1. Check the logs of the "Grocy" add-on to see if everything went well.
@@ -113,13 +113,13 @@ Panel. Set it `true` to enable it, `false` otherwise.
 
 The certificate file to use for SSL.
 
-**Note**: _The file MUST be stored in `/ssl/`, which is the default for Hass.io_
+**Note**: _The file MUST be stored in `/ssl/`, which is the default_
 
 ### Option: `keyfile`
 
 The private key file to use for SSL.
 
-**Note**: _The file MUST be stored in `/ssl/`, which is the default for Hass.io_
+**Note**: _The file MUST be stored in `/ssl/`, which is the default_
 
 ### Option: `culture`
 
@@ -220,7 +220,7 @@ Got questions?
 
 You have several options to get them answered:
 
-- The [Community Hass.io Add-ons Discord chat server][discord] for add-on
+- The [Community Home Assistant Add-ons Discord chat server][discord] for add-on
   support and feature requests.
 - The [Home Assistant Discord chat server][discord-ha] for general Home
   Assistant discussions and questions.
@@ -246,11 +246,11 @@ The original setup of this repository is by [Franck Nijhof][frenck].
 For a full list of all authors and contributors,
 check [the contributor's page][contributors].
 
-## We have got some Hass.io add-ons for you
+## We have got some Home Assistant add-ons for you
 
-Want some more functionality to your Hass.io Home Assistant instance?
+Want some more functionality to your Home Assistant instance?
 
-We have created multiple add-ons for Hass.io. For a full list, check out
+We have created multiple add-ons for Home Assistant. For a full list, check out
 our [GitHub Repository][repository].
 
 ## License
diff --git a/grocy/.README.j2 b/grocy/.README.j2
index 6501163..d72ec30 100644
--- a/grocy/.README.j2
+++ b/grocy/.README.j2
@@ -1,4 +1,4 @@
-# Community Hass.io Add-ons: Grocy
+# Community Home Assistant Add-on: Grocy
 
 [![Release][release-shield]][release] ![Project Stage][project-stage-shield] ![Project Maintenance][maintenance-shield]
 
@@ -31,8 +31,8 @@ management solution for your home, delivering features like:
 {% if channel == "edge" %}
 ## WARNING! THIS IS AN EDGE VERSION!
 
-This Hass.io Add-ons repository contains edge builds of add-ons. Edge builds
-add-ons are based upon the latest development version.
+This Home Assistant Add-ons repository contains edge builds of add-ons.
+Edge builds add-ons are based upon the latest development version.
 
 - They may not work at all.
 - They might stop working at any time.
@@ -52,7 +52,7 @@ If you are more interested in stable releases of our add-ons:
 {% if channel == "beta" %}
 ## 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.
diff --git a/grocy/config.json b/grocy/config.json
index 1890719..f854b1b 100755
--- a/grocy/config.json
+++ b/grocy/config.json
@@ -18,7 +18,7 @@
     "80/tcp": null
   },
   "ports_description": {
-    "80/tcp": "Web interface (Not required for Hass.io Ingress)"
+    "80/tcp": "Web interface (Not required for Ingress)"
   },
   "options": {
     "culture": "en",
diff --git a/grocy/rootfs/etc/cont-init.d/grocy.sh b/grocy/rootfs/etc/cont-init.d/grocy.sh
index 2536e00..0da89e7 100644
--- a/grocy/rootfs/etc/cont-init.d/grocy.sh
+++ b/grocy/rootfs/etc/cont-init.d/grocy.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bashio
 # ==============================================================================
-# Community Hass.io Add-ons: Grocy
+# Community Home Assistant Add-on: Grocy
 # Sets up Grocy before the server starts
 # ==============================================================================
 if ! bashio::fs.directory_exists "/data/grocy"; then
diff --git a/grocy/rootfs/etc/cont-init.d/nginx.sh b/grocy/rootfs/etc/cont-init.d/nginx.sh
index ed10934..f13a2ef 100755
--- a/grocy/rootfs/etc/cont-init.d/nginx.sh
+++ b/grocy/rootfs/etc/cont-init.d/nginx.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bashio
 # ==============================================================================
-# Community Hass.io Add-ons: Grocy
+# Community Home Assistant Add-on: Grocy
 # Configures NGINX for use with Grocy
 # ==============================================================================
 declare certfile
diff --git a/grocy/rootfs/etc/nginx/nginx.conf b/grocy/rootfs/etc/nginx/nginx.conf
index 3e64b05..5b14ff5 100644
--- a/grocy/rootfs/etc/nginx/nginx.conf
+++ b/grocy/rootfs/etc/nginx/nginx.conf
@@ -13,7 +13,7 @@ worker_processes 1;
 # Enables the use of JIT for regular expressions to speed-up their processing.
 pcre_jit on;
 
-# Write error log to Hass.io add-on log.
+# Write error log to the add-on log.
 error_log /proc/1/fd/1 error;
 
 # Load allowed environment vars
diff --git a/grocy/rootfs/etc/services.d/nginx/finish b/grocy/rootfs/etc/services.d/nginx/finish
index 0019742..e29d964 100755
--- a/grocy/rootfs/etc/services.d/nginx/finish
+++ b/grocy/rootfs/etc/services.d/nginx/finish
@@ -1,6 +1,6 @@
 #!/usr/bin/execlineb -S0
 # ==============================================================================
-# Community Hass.io Add-ons: Grocy
+# Community Home Assistant Add-on: Grocy
 # Take down the S6 supervision tree when Nginx fails
 # ==============================================================================
 if { s6-test ${1} -ne 0 }
diff --git a/grocy/rootfs/etc/services.d/nginx/run b/grocy/rootfs/etc/services.d/nginx/run
index c2f9acb..897aee7 100755
--- a/grocy/rootfs/etc/services.d/nginx/run
+++ b/grocy/rootfs/etc/services.d/nginx/run
@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bashio
 # ==============================================================================
-# Community Hass.io Add-ons: Grocy
+# Community Home Assistant Add-on: Grocy
 # Runs the Nginx daemon
 # ==============================================================================
 
diff --git a/grocy/rootfs/etc/services.d/php-fpm/finish b/grocy/rootfs/etc/services.d/php-fpm/finish
index 991547c..77ace55 100644
--- a/grocy/rootfs/etc/services.d/php-fpm/finish
+++ b/grocy/rootfs/etc/services.d/php-fpm/finish
@@ -1,6 +1,6 @@
 #!/usr/bin/execlineb -S0
 # ==============================================================================
-# Community Hass.io Add-ons: Grocy
+# Community Home Assistant Add-on: Grocy
 # Take down the S6 supervision tree when PHP FPM fails
 # ==============================================================================
 if { s6-test ${1} -ne 0 }
diff --git a/grocy/rootfs/etc/services.d/php-fpm/run b/grocy/rootfs/etc/services.d/php-fpm/run
index d7fad71..b92a3dc 100644
--- a/grocy/rootfs/etc/services.d/php-fpm/run
+++ b/grocy/rootfs/etc/services.d/php-fpm/run
@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bashio
 # ==============================================================================
-# Community Hass.io Add-ons: Grocy
+# Community Home Assistant Add-on: Grocy
 # Runs the PHP-FPM daemon
 # ==============================================================================
 export GROCY_CULTURE