diff --git a/pillars/roles.jinja b/pillars/roles.jinja
new file mode 100644
index 0000000..f0e7401
--- /dev/null
+++ b/pillars/roles.jinja
@@ -0,0 +1 @@
+{%- set roles=salt.cmd.shell("grep -Po '(?<=- ).*' /srv/salt/"+saltenv+"/pillars/servers/roles/server/"+grains['host']+".sls").split('\n') -%}
diff --git a/pillars/roles/aurpkgs/init.sls b/pillars/roles/aurpkgs/init.sls
index 0d188fa..04a52a2 100644
--- a/pillars/roles/aurpkgs/init.sls
+++ b/pillars/roles/aurpkgs/init.sls
@@ -1,21 +1,20 @@
+{%- from "roles.jinja" import roles with context %}
 {% set states = salt['cp.list_states'](saltenv) %}
 include:
   - roles.aurpkgs.none
-{%- if grains['roles'] is defined -%}
-  {%- if grains['roles'] is not none -%}
-    {%- if 'aurrepo' in grains['roles'] -%}
-      {%- for state in states %}
-        {%- if state.startswith("pillars.roles.aurpkgs.") -%}
-          {%- set role = state.split('.')[3] %}
+{%- if roles is not none -%}
+  {%- if 'aurrepo' in roles -%}
+    {%- for state in states %}
+      {%- if state.startswith("pillars.roles.aurpkgs.") -%}
+        {%- set role = state.split('.')[3] %}
   - roles.aurpkgs.{{ role }}
-        {%- endif -%}
-      {%- endfor -%}
-    {%- else -%}
-      {%- for role in grains['roles'] %}
-        {%- if 'pillars.roles.aurpkgs.'+role in states %}
+      {%- endif -%}
+    {%- endfor -%}
+  {%- else -%}
+    {%- for role in roles %}
+      {%- if 'pillars.roles.aurpkgs.'+role in states %}
   - roles.aurpkgs.{{ role }}
-        {%- endif -%}
-      {%- endfor -%}
-    {%- endif -%}
+      {%- endif -%}
+    {%- endfor -%}
   {%- endif -%}
 {%- endif -%}
diff --git a/pillars/roles/backup/init.sls b/pillars/roles/backup/init.sls
index 13c5f7d..5f41564 100644
--- a/pillars/roles/backup/init.sls
+++ b/pillars/roles/backup/init.sls
@@ -1,21 +1,20 @@
+{%- from "roles.jinja" import roles with context %}
 {% set states = salt['cp.list_states'](saltenv) %}
 include:
   - roles.backup.none
-{%- if grains['roles'] is defined -%}
-  {%- if grains['roles'] is not none -%}
-    {%- if 'backup' in grains['roles'] -%}
-      {%- for state in states %}
-        {%- if state.startswith("pillars.roles.backup.") -%}
-          {%- set role = state.split('.')[3] %}
+{%- if roles is not none -%}
+  {%- if 'backup' in roles -%}
+    {%- for state in states %}
+      {%- if state.startswith("pillars.roles.backup.") -%}
+        {%- set role = state.split('.')[3] %}
   - roles.backup.{{ role }}
-        {%- endif -%}
-      {%- endfor -%}
-    {%- else -%}
-      {%- for role in grains['roles'] %}
-        {%- if 'pillars.roles.backup.'+role in states %}
+      {%- endif -%}
+    {%- endfor -%}
+  {%- else -%}
+    {%- for role in roles %}
+      {%- if 'pillars.roles.backup.'+role in states %}
   - roles.backup.{{ role }}
-        {%- endif -%}
-      {%- endfor -%}
-    {%- endif -%}
+      {%- endif -%}
+    {%- endfor -%}
   {%- endif -%}
 {%- endif -%}
diff --git a/pillars/roles/ca/init.sls b/pillars/roles/ca/init.sls
index 3584c6d..5d1aad8 100644
--- a/pillars/roles/ca/init.sls
+++ b/pillars/roles/ca/init.sls
@@ -1,21 +1,20 @@
+{%- from "roles.jinja" import roles with context %}
 {% set states = salt['cp.list_states'](saltenv) %}
 include:
   - roles.ca.none
-{%- if grains['roles'] is defined -%}
-  {%- if grains['roles'] is not none -%}
-    {%- if 'ca' in grains['roles'] -%}
-      {%- for state in states %}
-        {%- if state.startswith("pillars.roles.ca.") -%}
-          {%- set role = state.split('.')[3] %}
+{%- if roles is not none -%}
+  {%- if 'ca' in roles -%}
+    {%- for state in states %}
+      {%- if state.startswith("pillars.roles.ca.") -%}
+        {%- set role = state.split('.')[3] %}
   - roles.ca.{{ role }}
-        {%- endif -%}
-      {%- endfor -%}
-    {%- else -%}
-      {%- for role in grains['roles'] %}
-        {%- if 'pillars.roles.ca.'+role in states %}
+      {%- endif -%}
+    {%- endfor -%}
+  {%- else -%}
+    {%- for role in roles %}
+      {%- if 'pillars.roles.ca.'+role in states %}
   - roles.ca.{{ role }}
-        {%- endif -%}
-      {%- endfor -%}
-    {%- endif -%}
+      {%- endif -%}
+    {%- endfor -%}
   {%- endif -%}
 {%- endif -%}
diff --git a/pillars/roles/database/init.sls b/pillars/roles/database/init.sls
index 4323e03..b6e84c4 100644
--- a/pillars/roles/database/init.sls
+++ b/pillars/roles/database/init.sls
@@ -1,15 +1,14 @@
+{%- from "roles.jinja" import roles with context %}
 {% set states = salt['cp.list_states'](saltenv) %}
 include:
   - roles.database.none
-{%- if grains['roles'] is defined -%}
-  {%- if grains['roles'] is not none -%}
-    {%- if 'mysql' in grains['roles'] -%}
-      {%- for state in states %}
-        {%- if state.startswith("pillars.roles.database.") -%}
-          {%- set role = state.split('.')[3] %}
+{%- if roles is not none -%}
+  {%- if 'mysql' in roles -%}
+    {%- for state in states %}
+      {%- if state.startswith("pillars.roles.database.") -%}
+        {%- set role = state.split('.')[3] %}
   - roles.database.{{ role }}
-        {%- endif -%}
-      {%- endfor -%}
-    {%- endif -%}
+      {%- endif -%}
+    {%- endfor -%}
   {%- endif -%}
 {%- endif -%}
diff --git a/pillars/roles/firewalld/init.sls b/pillars/roles/firewalld/init.sls
index 5372ee6..da82dc6 100644
--- a/pillars/roles/firewalld/init.sls
+++ b/pillars/roles/firewalld/init.sls
@@ -1,13 +1,12 @@
+{%- from "roles.jinja" import roles with context %}
 {% set states = salt['cp.list_states'](saltenv) %}
 include:
   - roles.firewalld.core
 
-{%- if grains['roles'] is defined -%}
-  {%- if grains['roles'] is not none -%}
-    {%- for role in grains['roles'] %}
-      {%- if 'pillars.roles.firewalld.'+role in states %}
+{%- if roles is not none -%}
+  {%- for role in roles %}
+    {%- if 'pillars.roles.firewalld.'+role in states %}
   - roles.firewalld.{{ role }}
-      {%- endif -%}
-    {%- endfor -%}
-  {%- endif -%}
+    {%- endif -%}
+  {%- endfor -%}
 {%- endif -%}
diff --git a/pillars/roles/git/init.sls b/pillars/roles/git/init.sls
index 608c7de..454d5f8 100644
--- a/pillars/roles/git/init.sls
+++ b/pillars/roles/git/init.sls
@@ -1,13 +1,12 @@
+{%- from "roles.jinja" import roles with context %}
 {% set states = salt['cp.list_states'](saltenv) %}
 include:
   - roles.git.none
 
-{%- if grains['roles'] is defined -%}
-  {%- if grains['roles'] is not none -%}
-    {%- for role in grains['roles'] %}
-      {%- if 'pillars.roles.git.'+role in states %}
+{%- if roles is not none -%}
+  {%- for role in roles %}
+    {%- if 'pillars.roles.git.'+role in states %}
   - roles.git.{{ role }}
-      {%- endif -%}
-    {%- endfor -%}
-  {%- endif -%}
+    {%- endif -%}
+  {%- endfor -%}
 {%- endif -%}
diff --git a/pillars/roles/gitea/init.sls b/pillars/roles/gitea/init.sls
deleted file mode 100644
index 608c7de..0000000
--- a/pillars/roles/gitea/init.sls
+++ /dev/null
@@ -1,13 +0,0 @@
-{% set states = salt['cp.list_states'](saltenv) %}
-include:
-  - roles.git.none
-
-{%- if grains['roles'] is defined -%}
-  {%- if grains['roles'] is not none -%}
-    {%- for role in grains['roles'] %}
-      {%- if 'pillars.roles.git.'+role in states %}
-  - roles.git.{{ role }}
-      {%- endif -%}
-    {%- endfor -%}
-  {%- endif -%}
-{%- endif -%}
diff --git a/pillars/roles/gitea/none.sls b/pillars/roles/gitea/none.sls
deleted file mode 100644
index e69de29..0000000
diff --git a/pillars/roles/gitea/portal.sls b/pillars/roles/gitea/portal.sls
deleted file mode 100644
index a40c249..0000000
--- a/pillars/roles/gitea/portal.sls
+++ /dev/null
@@ -1,25 +0,0 @@
-git:
-  tmux-root:
-    repo: "ssh://gitea@git.actcur.com:5022/actcur/tmux.git"
-    path: "/root/tmux"
-    branch: "master"
-    key: "git_actcur"
-    force: true
-    email: "actcur@actcur.com"
-    name: "Actaeus Curabitur"
-  tmux-ejparker:
-    repo: "ssh://gitea@git.actcur.com:5022/actcur/tmux.git"
-    path: "/ejparker/tmux"
-    branch: "master"
-    key: "git_actcur"
-    force: true
-    email: "actcur@actcur.com"
-    name: "Actaeus Curabitur"
-  web:
-    repo: "ssh://gitea@git.actcur.com:5022/actcur/portal.git"
-    path: "/srv/http/portal"
-    branch: "master"
-    key: "git_actcur"
-    force: true
-    email: "actcur@actcur.com"
-    name: "Actaeus Curabitur"
diff --git a/pillars/roles/gitea/saltmaster.sls b/pillars/roles/gitea/saltmaster.sls
deleted file mode 100644
index 05d6f71..0000000
--- a/pillars/roles/gitea/saltmaster.sls
+++ /dev/null
@@ -1,17 +0,0 @@
-git:
-  salt:
-    repo: "ssh://gitea@git.actcur.com:5022/actcur/salt.git"
-    path: "/srv/salt/prod"
-    branch: "master"
-    key: "git_actcur"
-    force: true
-    email: "actcur@actcur.com"
-    name: "Actaeus Curabitur"
-  salt_dev:
-    repo: "ssh://gitea@git.actcur.com:5022/actcur/salt.git"
-    path: "/srv/salt/dev"
-    branch: "dev"
-    key: "git_actcur"
-    force: true
-    email: "actcur@actcur.com"
-    name: "Actaeus Curabitur"
diff --git a/pillars/roles/gitea/ytdownloader.sls b/pillars/roles/gitea/ytdownloader.sls
deleted file mode 100644
index ed666f9..0000000
--- a/pillars/roles/gitea/ytdownloader.sls
+++ /dev/null
@@ -1,9 +0,0 @@
-git:
-  ytdownloader:
-    repo: "ssh://gitea@git.actcur.com:5022/actcur/ytdownloader.git"
-    path: "/root/scripts/ytdownloader"
-    branch: "master"
-    key: "git_actcur"
-    force: true
-    email: "actcur@actcur.com"
-    name: "Actaeus Curabitur"
diff --git a/pillars/roles/host/init.sls b/pillars/roles/host/init.sls
index 6074e07..6d78cd3 100644
--- a/pillars/roles/host/init.sls
+++ b/pillars/roles/host/init.sls
@@ -1,13 +1,12 @@
+{%- from "roles.jinja" import roles with context %}
 {% set states = salt['cp.list_states'](saltenv) %}
 include:
   - roles.host.none
 
-{%- if grains['roles'] is defined -%}
-  {%- if grains['roles'] is not none -%}
-    {%- for role in grains['roles'] %}
-      {%- if 'pillars.roles.host.'+role in states %}
+{%- if roles is not none -%}
+  {%- for role in roles %}
+    {%- if 'pillars.roles.host.'+role in states %}
   - roles.host.{{ role }}
-      {%- endif -%}
-    {%- endfor -%}
-  {%- endif -%}
+    {%- endif -%}
+  {%- endfor -%}
 {%- endif -%}
diff --git a/pillars/roles/laradev/init.sls b/pillars/roles/laradev/init.sls
index c8ab74b..a778ecb 100644
--- a/pillars/roles/laradev/init.sls
+++ b/pillars/roles/laradev/init.sls
@@ -1,13 +1,12 @@
+{%- from "roles.jinja" import roles with context %}
 {% set states = salt['cp.list_states'](saltenv) %}
 include:
   - roles.laradev.none
 
-{%- if grains['roles'] is defined -%}
-  {%- if grains['roles'] is not none -%}
-    {%- for role in grains['roles'] %}
-      {%- if 'pillars.roles.laradev.'+role in states %}
+{%- if roles is not none -%}
+  {%- for role in roles %}
+    {%- if 'pillars.roles.laradev.'+role in states %}
   - roles.laradev.{{ role }}
-      {%- endif -%}
-    {%- endfor -%}
-  {%- endif -%}
+    {%- endif -%}
+  {%- endfor -%}
 {%- endif -%}
diff --git a/pillars/roles/lxc/init.sls b/pillars/roles/lxc/init.sls
index 902627d..832082a 100644
--- a/pillars/roles/lxc/init.sls
+++ b/pillars/roles/lxc/init.sls
@@ -1,13 +1,12 @@
+{%- from "roles.jinja" import roles with context %}
 {% set states = salt['cp.list_states'](saltenv) %}
 include:
   - roles.lxc.container_profiles
 
-{%- if grains['roles'] is defined -%}
-  {%- if grains['roles'] is not none -%}
-    {%- for role in grains['roles'] %}
-      {%- if 'pillars.roles.lxc.'+role in states %}
+{%- if roles is not none -%}
+  {%- for role in roles %}
+    {%- if 'pillars.roles.lxc.'+role in states %}
   - roles.lxc.{{ role }}
-      {%- endif -%}
-    {%- endfor -%}
-  {%- endif -%}
+    {%- endif -%}
+  {%- endfor -%}
 {%- endif -%}
diff --git a/pillars/roles/mount/init.sls b/pillars/roles/mount/init.sls
index 086dafc..da413c1 100644
--- a/pillars/roles/mount/init.sls
+++ b/pillars/roles/mount/init.sls
@@ -1,13 +1,12 @@
+{%- from "roles.jinja" import roles with context %}
 {% set states = salt['cp.list_states'](saltenv) %}
 include:
   - roles.mount.none
 
-{%- if grains['roles'] is defined -%}
-  {%- if grains['roles'] is not none -%}
-    {%- for role in grains['roles'] %}
-      {%- if 'pillars.roles.mount.'+role in states %}
+{%- if roles is not none -%}
+  {%- for role in roles %}
+    {%- if 'pillars.roles.mount.'+role in states %}
   - roles.mount.{{ role }}
-      {%- endif -%}
-    {%- endfor -%}
-  {%- endif -%}
+    {%- endif -%}
+  {%- endfor -%}
 {%- endif -%}
diff --git a/pillars/roles/nginx/init.sls b/pillars/roles/nginx/init.sls
index 4debb29..dbbe42c 100644
--- a/pillars/roles/nginx/init.sls
+++ b/pillars/roles/nginx/init.sls
@@ -1,21 +1,20 @@
+{%- from "roles.jinja" import roles with context %}
 {% set states = salt['cp.list_states'](saltenv) %}
 include:
   - roles.nginx.none
-{%- if grains['roles'] is defined -%}
-  {%- if grains['roles'] is not none -%}
-    {%- if 'portal' in grains['roles'] -%}
-      {%- for state in states %}
-        {%- if state.startswith("pillars.roles.nginx.") -%}
-          {%- set role = state.split('.')[3] %}
+{%- if roles is not none -%}
+  {%- if 'portal' in roles -%}
+    {%- for state in states %}
+      {%- if state.startswith("pillars.roles.nginx.") -%}
+        {%- set role = state.split('.')[3] %}
   - roles.nginx.{{ role }}
-        {%- endif -%}
-      {%- endfor -%}
-    {%- else -%}
-      {%- for role in grains['roles'] %}
-        {%- if 'pillars.roles.nginx.'+role in states %}
+      {%- endif -%}
+    {%- endfor -%}
+  {%- else -%}
+    {%- for role in roles %}
+      {%- if 'pillars.roles.nginx.'+role in states %}
   - roles.nginx.{{ role }}
-        {%- endif -%}
-      {%- endfor -%}
-    {%- endif -%}
+      {%- endif -%}
+    {%- endfor -%}
   {%- endif -%}
 {%- endif -%}
diff --git a/pillars/roles/router/init.sls b/pillars/roles/router/init.sls
index 3ce0f72..0a35c71 100644
--- a/pillars/roles/router/init.sls
+++ b/pillars/roles/router/init.sls
@@ -1,15 +1,14 @@
+{%- from "roles.jinja" import roles with context %}
 {% set states = salt['cp.list_states'](saltenv) %}
 include:
   - roles.router.none
-{%- if grains['roles'] is defined -%}
-  {%- if grains['roles'] is not none -%}
-    {%- if 'router' in grains['roles'] -%}
-      {%- for state in states %}
-        {%- if state.startswith("pillars.roles.router.") -%}
-          {%- set role = state.split('.')[3] %}
+{%- if roles is not none -%}
+  {%- if 'router' in roles -%}
+    {%- for state in states %}
+      {%- if state.startswith("pillars.roles.router.") -%}
+        {%- set role = state.split('.')[3] %}
   - roles.router.{{ role }}
-        {%- endif -%}
-      {%- endfor -%}
-    {%- endif -%}
+      {%- endif -%}
+    {%- endfor -%}
   {%- endif -%}
 {%- endif -%}
diff --git a/pillars/roles/services/init.sls b/pillars/roles/services/init.sls
index a545ecc..05c84f4 100644
--- a/pillars/roles/services/init.sls
+++ b/pillars/roles/services/init.sls
@@ -1,15 +1,14 @@
+{%- from "roles.jinja" import roles with context %}
 {% set states = salt['cp.list_states'](saltenv) %}
 include:
   - roles.services.none
-{%- if grains['roles'] is defined -%}
-  {%- if grains['roles'] is not none -%}
-    {%- if 'icinga' in grains['roles'] -%}
-      {%- for state in states %}
-        {%- if state.startswith("pillars.roles.services.") -%}
-          {%- set role = state.split('.')[3] %}
+{%- if roles is not none -%}
+  {%- if 'icinga' in roles -%}
+    {%- for state in states %}
+      {%- if state.startswith("pillars.roles.services.") -%}
+        {%- set role = state.split('.')[3] %}
   - roles.services.{{ role }}
-        {%- endif -%}
-      {%- endfor -%}
-    {%- endif -%}
+      {%- endif -%}
+    {%- endfor -%}
   {%- endif -%}
 {%- endif -%}