diff --git a/_layouts/dist.html b/_layouts/dist.html
index 61206cc..cc9ccf9 100644
--- a/_layouts/dist.html
+++ b/_layouts/dist.html
@@ -9,15 +9,14 @@ layout: default
 {% assign domain = repo_info.domain | default: site.apt.domain %}
 {% assign list = site.packages | where: 'Repo', repo | where: 'Archive', dist %}
 
-<p>
-    NOTE: If this is your first time here, you need to do some configurations before you can use this repository.
-    Please read the <a target="_blank" href="{{ "/#setup" | absolute_url }}">instructions</a>.
-</p>
-
 <h2>{{ repo }} - {{ dist }}</h2>
 
 <p>{{ repo_info.description }}</p>
 
+{% include setup-instructions.html repo=repo distribution=dist collapse=true %}
+
+<h2>Packages</h2>
+
 {% for component in site.apt.components %}
 
 <h3>{{ component }}</h3>
diff --git a/_layouts/repo.html b/_layouts/repo.html
index 7bca7bc..0a22212 100644
--- a/_layouts/repo.html
+++ b/_layouts/repo.html
@@ -7,7 +7,9 @@ layout: default
 
 <h2>{{ page.title }} repository</h2>
 
-<p>Choose your ubuntu version below</p>
+{% include setup-instructions.html repo=id %}
+
+<h2>Choose your ubuntu version below</h2>
 
 <ul>
 {% for dist in dists %}
diff --git a/index.md b/index.md
index 0bed488..817b7b7 100644
--- a/index.md
+++ b/index.md
@@ -7,25 +7,7 @@ The repository is hosted on [{{ site.apt.domain }}](https://{{ site.apt.domain }
 
 ## Setup
 
-First you need to make sure some packages are installed and that our `gpg` key is added to `apt`:
-
-```bash
-$ sudo apt-get install software-properties-common
-$ curl https://{{ site.apt.domain }}/key 2> /dev/null | sudo apt-key add -
-```
-
-Then you can add one or more of your repositories:
-
-{% include apt-add.html repo="eosio" components="stable" update=true %}
-
-The url is structures as follows:
-
-```html
-https://{{ site.apt.domain }}/<repository> <distribution> <component> [ <component1> ] [ <componentN> ]
-```
-
-one `repository`, `distribution` and one or more `components` needs to be specified. These are explained below.
-
+{% include setup-instructions.html %}
 
 ## Contents