diff --git a/.github/settings.yml b/.github/settings.yml
index 8531426..0e5e625 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -1,6 +1,6 @@
 ---
 repository:
-  description: "Docker Python base images (Alpine) - Community Home Assistant Add-ons"
+  description: "Docker Python base images (Alpine) - Home Assistant Community Add-ons"
   homepage: https://addons.community
   topics: docker, baseimage, baseimage-docker, addons, home-assistant, home-assistant, alpine, python
   private: false
diff --git a/README.md b/README.md
index e061db5..b6fd2e7 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Community Home Assistant Add-on: Python Base Images
+# Home Assistant Community Add-on: Python Base Images
 
 [![GitHub Release][releases-shield]][releases]
 ![Project Stage][project-stage-shield]
@@ -21,12 +21,12 @@
 
 [![Support Frenck on Patreon][patreon-shield]][patreon]
 
-Docker Python base images used by Community Home Assistant Add-ons.
+Docker Python base images used by Home Assistant Community Add-ons.
 
 ## About
 
 These are the Python3 add-on base images for the
-Community Home Assistant Add-ons and are created to give the project more
+Home Assistant Community Add-ons and are created to give the project more
 control over the Python used.
 
 Main reason for this, is because in Alpine 3.9 the shipped Python was broken
@@ -55,7 +55,7 @@ Got questions?
 
 You have several options to get them answered:
 
-- The [Community Home Assistant Add-ons Discord chat server][discord] for add-on
+- The [Home Assistant Community 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.
diff --git a/base/Dockerfile b/base/Dockerfile
index 9d6e797..6d33053 100644
--- a/base/Dockerfile
+++ b/base/Dockerfile
@@ -143,7 +143,7 @@ LABEL \
     io.hass.type="base" \
     io.hass.version=${BUILD_VERSION} \
     maintainer="Franck Nijhof <frenck@addons.community>" \
-    org.label-schema.description="Community Home Assistant Add-on: ${BUILD_ARCH} Python Base image" \
+    org.label-schema.description="Home Assistant Community Add-on: ${BUILD_ARCH} Python Base image" \
     org.label-schema.build-date=${BUILD_DATE} \
     org.label-schema.name="Add-on Python base for ${BUILD_ARCH}" \
     org.label-schema.schema-version="1.0" \
@@ -151,4 +151,4 @@ LABEL \
     org.label-schema.usage="https://github.com/hassio-addons/addon-base-python/blob/master/README.md" \
     org.label-schema.vcs-ref=${REF} \
     org.label-schema.vcs-url="https://github.com/hassio-addons/addon-base-python" \
-    org.label-schema.vendor="Community Home Assistant Add-ons"
+    org.label-schema.vendor="Home Assistant Community Add-ons"