diff --git a/_layouts/repo.html b/_layouts/repo.html
index 0e960ea..c4e9462 100644
--- a/_layouts/repo.html
+++ b/_layouts/repo.html
@@ -2,10 +2,11 @@
 layout: default
 ---
 
-{% assign repo = page.name %}
+{% assign domain = page.domain | default: site.apt.domain %}
+{% assign repo = page.repo %}
 {% assign list = site.data.index[repo].bionic %}
 
-<h2>{{ page.title }}</h2>
+<h2>{{ page.title }} Repository</h2>
 
 <p>{{ page.description }}</p>
 
@@ -15,7 +16,7 @@ layout: default
 
 {% if list[component].size > 0 %}
 
-{% include apt-add.html domain=repo repo=repo components=component %}
+{% include apt-add.html domain=domain repo=repo components=component %}
 
 <table class="d-lg-table">
     <tr>
diff --git a/_repos/bos.md b/_repos/bos.md
index 0c3ca54..b31d697 100644
--- a/_repos/bos.md
+++ b/_repos/bos.md
@@ -1,7 +1,9 @@
 ---
 layout: repo
 permalink: /r/bos
-name: bos
-title: BOS Repository
+
+title: BOS
+domain: apt.bossweden.org
+repo: bos
 description: BOS Chain port of EOSIO and related software.
 ---
diff --git a/_repos/eosio.md b/_repos/eosio.md
index 71ddaa7..f8e02d6 100644
--- a/_repos/eosio.md
+++ b/_repos/eosio.md
@@ -1,7 +1,8 @@
 ---
 layout: repo
 permalink: /r/eosio
-name: eosio
-title: EOSIO repository
+
+title: EOSIO
+repo: eosio
 description: EOS related software
 ---
diff --git a/_repos/main.md b/_repos/main.md
index 8ae66d6..8c75fca 100644
--- a/_repos/main.md
+++ b/_repos/main.md
@@ -1,7 +1,8 @@
 ---
 layout: repo
 permalink: /r/main
-name: main
-title: Main repository
+
+title: Main
+repo: main
 description: Releases of Sw/eden own software.
 ---
diff --git a/_repos/wax.md b/_repos/wax.md
index 95d511e..153fb66 100644
--- a/_repos/wax.md
+++ b/_repos/wax.md
@@ -1,7 +1,9 @@
 ---
 layout: repo
 permalink: /r/wax
-name: wax
-title: WAX Repository
+
+title: WAX
+domain: apt.waxsweden.org
+repo: wax
 description: WAX Chain port of EOSIO and related software.
 ---
diff --git a/_repos/worbli.md b/_repos/worbli.md
index ffa4cb8..b2d9265 100644
--- a/_repos/worbli.md
+++ b/_repos/worbli.md
@@ -1,7 +1,9 @@
 ---
 layout: repo
 permalink: /r/worbli
-name: worbli
-title: Worbli Repository
+
+title: Worbli
+domain: apt.worblisweden.org
+repo: worbli
 description: Worbli Chain port of EOSIO and related software.
 ---
diff --git a/index.md b/index.md
index 379a355..0fda876 100644
--- a/index.md
+++ b/index.md
@@ -29,7 +29,7 @@ Here is a list of different repositories we provide.
 ### Repositories
 
 {% for repo in site.repos %}
-* [{{ repo.name }}]({{ repo.url | relative_url }}) - {{ repo.description }}
+* [{{ repo.title }}]({{ repo.url | relative_url }}) - {{ repo.description }}
 {% endfor %}
 
 ### Components