diff --git a/.README.j2 b/.README.j2
index 8adae6b..46d20de 100644
--- a/.README.j2
+++ b/.README.j2
@@ -1,8 +1,8 @@
 # EDGE - Home Assistant Add-ons
 
-![Project Stage][project-stage-shield]
-![Maintenance][maintenance-shield]
-[![License][license-shield]](LICENSE)
+![project stage][project-stage-shield]
+![maintenance][maintenance-shield]
+[![license][license-shield]](./LICENSE)
 
 ## WARNING! THIS IS AN EDGE REPOSITORY
 
@@ -56,7 +56,9 @@ The latest build commit SHA hash of each add-on, represents the version number.
 
 ## Support
 
-Open an issue here on GitHub.
+Got questions?
+
+Open an [issue on GitHub][issues].
 Note, we use a separate GitHub repository for each add-on.
 Please ensure you are creating the issue on the correct GitHub repository matching the add-on.
 
@@ -90,7 +92,7 @@ We are currently not accepting third party add-ons to this repository.
 {% endif %}
 {% endfor %}
 {% endfor %}
-[issue]: https://github.com/{{ name }}/issues
+[issues]: https://github.com/{{ name }}/issues
 [license-shield]: https://img.shields.io/github/license/{{ name }}.svg
 [maintenance-shield]: https://img.shields.io/maintenance/yes/2024.svg
 [project-stage-shield]: https://img.shields.io/badge/project%20stage-experimental-yellow.svg
diff --git a/README.md b/README.md
index cedad77..2a11f45 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 # EDGE - Home Assistant Add-ons
 
-![Project Stage][project-stage-shield]
-![Maintenance][maintenance-shield]
-[![License][license-shield]](LICENSE)
+![project stage][project-stage-shield]
+![maintenance][maintenance-shield]
+[![license][license-shield]](./LICENSE)
 
 ## WARNING! THIS IS AN EDGE REPOSITORY
 
@@ -50,7 +50,7 @@ The latest build commit SHA hash of each add-on, represents the version number.
 
 ## Support
 
-Open an issue here on GitHub.
+Open an [issue on GitHub][issues].
 Note, we use a separate GitHub repository for each add-on.
 Please ensure you are creating the issue on the correct GitHub repository matching the add-on.
 
@@ -71,6 +71,7 @@ We are currently not accepting third party add-ons to this repository.
 
 [addon-doc-vscode]: https://github.com/finleyfamily/hass-addon-vscode/blob/3fd4b8e/README.md
 [addon-vscode]: https://github.com/finleyfamily/hass-addon-vscode/tree/3fd4b8e
+[issues]: https://github.com/finleyfamily/hass-repository-edge/issues
 [license-shield]: https://img.shields.io/github/license/finleyfamily/hass-repository-edge.svg
 [maintenance-shield]: https://img.shields.io/maintenance/yes/2024.svg
 [project-stage-shield]: https://img.shields.io/badge/project%20stage-experimental-yellow.svg
diff --git a/repository.json b/repository.json
deleted file mode 100644
index fdec56c..0000000
--- a/repository.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "maintainer": "Kyle Finley <kyle@finley.sh>",
-    "name": "Finley Family Home Assistant Add-ons - EDGE!",
-    "url": "https://github.com/finleyfamily/hass-repository-edge"
-}
diff --git a/repository.yaml b/repository.yaml
new file mode 100644
index 0000000..cebea3a
--- /dev/null
+++ b/repository.yaml
@@ -0,0 +1,4 @@
+# https://developers.home-assistant.io/docs/add-ons/repository#repository-configuration
+name: Finley Family Home Assistant Add-ons - EDGE!
+url: https://github.com/finleyfamily/hass-repository-edge
+maintainer: Kyle Finley <kyle@finley.sh>