diff --git a/postgres/client.sls b/postgres/client.sls
index 44986b1..d171f9a 100644
--- a/postgres/client.sls
+++ b/postgres/client.sls
@@ -1,15 +1,8 @@
 {% from "postgres/map.jinja" import postgres with context %}
 
 {% if salt['pillar.get']('postgres:use_upstream_repo') %}
-install-postgresql-repo:
-  pkgrepo.managed:
-    - humanname: PostgreSQL Official Repository
-    - name: {{ postgres.pkg_repo }}
-    - keyid: B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8
-    - keyserver: keyserver.ubuntu.com
-    - file: {{ postgres.pkg_repo_file }}
-    - require_in:
-        - install-postgresql-client
+include:
+  - postgres.upstream
 {% endif %}
 
 install-postgresql-client:
diff --git a/postgres/init.sls b/postgres/init.sls
index 1c3611e..f1a2009 100644
--- a/postgres/init.sls
+++ b/postgres/init.sls
@@ -1,15 +1,8 @@
 {% from "postgres/map.jinja" import postgres with context %}
 
 {% if salt['pillar.get']('postgres:use_upstream_repo') %}
-install-postgresql-repo:
-  pkgrepo.managed:
-    - humanname: PostgreSQL Official Repository
-    - name: {{ postgres.pkg_repo }}
-    - keyid: B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8
-    - keyserver: keyserver.ubuntu.com
-    - file: {{ postgres.pkg_repo_file }}
-    - require_in:
-        - install-postgresql
+include:
+  - postgres.upstream
 {% endif %}
 
 install-postgresql:
diff --git a/postgres/upstream.sls b/postgres/upstream.sls
new file mode 100644
index 0000000..d5da6da
--- /dev/null
+++ b/postgres/upstream.sls
@@ -0,0 +1,11 @@
+{% from "postgres/map.jinja" import postgres with context %}
+
+{% if grains['os'] == 'Ubuntu' %} # Other distro support should be added here
+install-postgresql-repo:
+  pkgrepo.managed:
+    - humanname: PostgreSQL Official Repository
+    - name: {{ postgres.pkg_repo }}
+    - keyid: B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8
+    - keyserver: keyserver.ubuntu.com
+    - file: {{ postgres.pkg_repo_file }}
+{% endif %}