diff --git a/.github/settings.yml b/.github/settings.yml
index e321cf1..c0254eb 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -1,8 +1,8 @@
 ---
 repository:
-  description: "chrony - Community Home Assistant Add-on"
+  description: "chrony - Community Home Assistant Add-ons"
   homepage: https://addons.community
-  topics: ntp, chrony, addons, home-assistant, homeassistant
+  topics: ntp, chrony, addon, addons, home-assistant, homeassistant
   private: false
   has_issues: true
   has_projects: false
@@ -53,7 +53,7 @@ labels:
   # Additional markers
   - name: "Security"
     color: ee0701
-    description: "Marks a security issues that needs to be resolved asap."
+    description: "Marks a security issue that needs to be resolved asap."
   - name: "Idea"
     color: fef2c0
     description: "Marks an idea, which might be excepted and implemented."
diff --git a/chrony/.README.j2 b/chrony/.README.j2
index c757573..77d0f58 100644
--- a/chrony/.README.j2
+++ b/chrony/.README.j2
@@ -1,4 +1,4 @@
-# Community Home Assistant Add-ons: chrony
+# Community Home Assistant Add-on: chrony
 
 [![Release][release-shield]][release] ![Project Stage][project-stage-shield] ![Project Maintenance][maintenance-shield]
 
@@ -18,8 +18,8 @@ time on devices with controlled internet access (such as cameras).
 {% if channel == "edge" %}
 ## WARNING! THIS IS AN EDGE VERSION!
 
-This Home Assistant Add-ons repository contains edge builds of add-ons. Edge
-build 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.
@@ -39,7 +39,7 @@ If you are more interested in stable releases of our add-ons:
 {% if channel == "beta" %}
 ## WARNING! THIS IS A BETA VERSION!
 
-This Home Assistant Add-on 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/chrony/rootfs/etc/cont-init.d/chrony.sh b/chrony/rootfs/etc/cont-init.d/chrony.sh
index fac2f6b..469208b 100644
--- a/chrony/rootfs/etc/cont-init.d/chrony.sh
+++ b/chrony/rootfs/etc/cont-init.d/chrony.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bashio
 # ==============================================================================
-# Community Home Assistant Add-ons: chrony
+# Community Home Assistant Add-on: chrony
 # Configures chrony
 # ==============================================================================
 readonly CHRONY_CONF='/etc/chrony/chrony.conf'
diff --git a/chrony/rootfs/etc/services.d/chronyd/finish b/chrony/rootfs/etc/services.d/chronyd/finish
index 8f19577..8a3ac98 100644
--- a/chrony/rootfs/etc/services.d/chronyd/finish
+++ b/chrony/rootfs/etc/services.d/chronyd/finish
@@ -1,6 +1,6 @@
 #!/usr/bin/execlineb -S0
 # ==============================================================================
-# Community Home Assistant Add-ons: chrony
+# Community Home Assistant Add-on: chrony
 # Take down the S6 supervision tree when chrony fails
 # ==============================================================================
 if -n { s6-test $# -ne 0 }
diff --git a/chrony/rootfs/etc/services.d/chronyd/run b/chrony/rootfs/etc/services.d/chronyd/run
index 71b3a41..c609b6f 100644
--- a/chrony/rootfs/etc/services.d/chronyd/run
+++ b/chrony/rootfs/etc/services.d/chronyd/run
@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bashio
 # ==============================================================================
-# Community Home Assistant Add-ons: chrony
+# Community Home Assistant Add-on: chrony
 # Runs chrony daemon
 # ==============================================================================
 declare -a options