diff --git a/salt/map.jinja b/salt/map.jinja
index 3c9ed4c..5fc70ca 100644
--- a/salt/map.jinja
+++ b/salt/map.jinja
@@ -71,7 +71,6 @@ that differ from whats in defaults.yaml
       'master': {
         'gitfs_provider': 'pygit2'
       },
-      'repotype': 'epel',
     },
     'Suse':    {},
     'Gentoo':  {
diff --git a/salt/pkgrepo/absent.sls b/salt/pkgrepo/absent.sls
index d79b15f..b66c8e3 100644
--- a/salt/pkgrepo/absent.sls
+++ b/salt/pkgrepo/absent.sls
@@ -1,2 +1,2 @@
 include:
-  - .{{ grains['os']|lower }}.absent
+  - .{{ grains['os_family']|lower }}.absent
diff --git a/salt/pkgrepo/debian/saltstack.gpg b/salt/pkgrepo/debian/saltstack.gpg
deleted file mode 100644
index 78da01e..0000000
Binary files a/salt/pkgrepo/debian/saltstack.gpg and /dev/null differ
diff --git a/salt/pkgrepo/init.sls b/salt/pkgrepo/init.sls
index e6eeb3c..b2c794c 100644
--- a/salt/pkgrepo/init.sls
+++ b/salt/pkgrepo/init.sls
@@ -1,6 +1,2 @@
-{% set name = {
-    'RedHat': 'redhat',
-    'Debian': grains['os_family']|lower,
-}.get(grains.os_family) %}
 include:
-  - .{{ name }}
+  - .{{ grains['os_family']|lower }}
diff --git a/salt/pkgrepo/ubuntu/absent.sls b/salt/pkgrepo/ubuntu/absent.sls
deleted file mode 100644
index 1b63537..0000000
--- a/salt/pkgrepo/ubuntu/absent.sls
+++ /dev/null
@@ -1,5 +0,0 @@
-drop-saltstack-pkgrepo:
-  pkgrepo.absent:
-    - name: deb http://repo.saltstack.com/apt/ubuntu/{{ grains['lsb_distrib_release'] }}/amd64/latest {{ grains['lsb_distrib_codename'] }} main
-    - file: /etc/apt/sources.list.d/saltstack.list
-    - key_url: https://repo.saltstack.com/apt/ubuntu/{{ grains['lsb_distrib_release'] }}/amd64/latest/SALTSTACK-GPG-KEY.pub
\ No newline at end of file
diff --git a/salt/pkgrepo/ubuntu/init.sls b/salt/pkgrepo/ubuntu/init.sls
deleted file mode 100644
index 0fc7519..0000000
--- a/salt/pkgrepo/ubuntu/init.sls
+++ /dev/null
@@ -1,5 +0,0 @@
-saltstack-pkgrepo:
-  pkgrepo.managed:
-    - name: deb https://repo.saltstack.com/apt/ubuntu/{{ grains['lsb_distrib_release'] }}/amd64/latest {{ grains['lsb_distrib_codename'] }} main
-    - file: /etc/apt/sources.list.d/saltstack.list
-    - key_url: https://repo.saltstack.com/apt/ubuntu/{{ grains['lsb_distrib_release'] }}/amd64/latest/SALTSTACK-GPG-KEY.pub
\ No newline at end of file