diff --git a/.README.j2 b/.README.j2
index 006292b70..7315a75a3 100644
--- a/.README.j2
+++ b/.README.j2
@@ -1,4 +1,4 @@
-# EDGE - Community Hass.io Add-ons for Home Assistant
+# EDGE - Community Home Assistant Add-ons
 
 ![Project Stage][project-stage-shield]
 ![Maintenance][maintenance-shield]
@@ -12,8 +12,8 @@
 
 ## WARNING! THIS IS AN EDGE REPOSITORY
 
-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.
@@ -31,9 +31,11 @@ If you are more interested in stable releases of our add-ons:
 
 ## Installation
 
-Adding this add-ons repository to your Hass.io Home Assistant instance is
-pretty easy. Follow [the official instructions][third-party-addons] on the
-website of Home Assistant, and use the following URL:
+Adding this add-ons repository to your Home Assistant instance is
+pretty straightforward. In the Home Assistant add-on store,
+a possibility to add a repository is provided.
+
+Use the following URL to add this repository:
 
 ```txt
 {{ repo }}
@@ -69,8 +71,9 @@ Got questions?
 
 You have several options to get them answered:
 
+- The Community Home Assistant Add-ons [Discord Chat Server][discord]
 - The Home Assistant [Community Forum][forum].
-- The Home Assistant [Discord Chat Server][discord].
+- The Home Assistant [Discord Chat Server][discord-ha].
 - Join the [Reddit subreddit][reddit] in [/r/homeassistant][reddit]
 
 You could also open an issue here on GitHub. Note, we use a separate
@@ -95,16 +98,14 @@ Thank you for being involved! :heart_eyes:
 
 ## Adding a new add-on
 
-Have you created an add-on that you want to list in the Community Repository?
-Contact [Franck Nijhof][frenck]:
+We are currently not accepting third party add-ons to this repository.
+
+For questions, please contact [Franck Nijhof][frenck]:
 
 - Drop him an email: frenck@addons.community
 - Chat with him on [Discord Chat][discord]
 - Message him via the forums: [frenck][forum-frenck]
 
-He will set up a GitHub repository and all the other plumbing,
-and of course, give you developer access to your contribution.
-
 ## License
 
 MIT License
@@ -149,6 +150,7 @@ SOFTWARE.
 {% endfor %}
 {% endfor %}
 [awesome-shield]: https://img.shields.io/badge/awesome%3F-yes-brightgreen.svg
+[discord-ha]: https://discord.gg/c5DvZ4e
 [discord-shield]: https://img.shields.io/discord/478094546522079232.svg
 [discord]: https://discord.me/hassioaddons
 [forum-frenck]: https://community.home-assistant.io/u/frenck/?u=frenck
diff --git a/.github/settings.yml b/.github/settings.yml
index 9765c473f..d0149e8a3 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -1,8 +1,8 @@
 ---
 repository:
-  description: "EDGE - Community Hass.io Add-ons for Home Assistant"
+  description: "EDGE - Community Home Assistant Add-ons"
   homepage: https://addons.community
-  topics: edge, unstable, nightly, home-assistant, hassio, addons, hassio-repository
+  topics: edge, unstable, home-assistant, homeassistant, addons, addons-repository, repository
   private: false
   has_issues: true
   has_projects: false
diff --git a/repository.json b/repository.json
index 65ac838cc..bf60f2364 100644
--- a/repository.json
+++ b/repository.json
@@ -1,5 +1,5 @@
 {
-  "name": "EDGE - Community Hass.io Add-ons",
+  "name": "EDGE - Community Home Assistant Add-ons",
   "url": "https://addons.community/edge",
   "maintainer": "Franck Nijhof <frenck@addons.community>"
 }