diff --git a/pillar/role/salt/master.sls b/pillar/role/salt/master.sls
new file mode 100644
index 0000000..e6da1af
--- /dev/null
+++ b/pillar/role/salt/master.sls
@@ -0,0 +1,36 @@
+salt:
+  master_remove_config: True
+  master:
+    cache: redis
+    cli_summary: True
+    ipv6: True
+    file_ignore_glob:
+      - '*.pyc'
+      - '*.swp'
+    fileserver_backend:
+      - roots
+      - git
+    file_roots:
+      base:
+        - /srv/formulas/salt-formula
+    gitfs_remotes:
+      - https://git.com.de/LibertaCasa/salt.git:
+        - root: salt
+        - base: production
+    ext_pillar:
+      - netbox:
+          virtual_machines: True
+          interfaces: True
+          interface_ips: True
+          site_details: False
+          site_prefixes: False
+      - git:
+        - production https://git.com.de/LibertaCasa/salt.git:
+          - root: pillar
+    ext_pillar_first: True
+    pillar_merge_lists: True
+    log_level: info
+    show_jid: True
+    timeout: 20
+    gather_job_timeout: 20
+    keep_jobs: 30
diff --git a/salt/profile/salt/master.sls b/salt/profile/salt/master.sls
new file mode 100644
index 0000000..869afa7
--- /dev/null
+++ b/salt/profile/salt/master.sls
@@ -0,0 +1,2 @@
+include:
+  - salt.master
diff --git a/salt/role/salt/master.sls b/salt/role/salt/master.sls
new file mode 100644
index 0000000..48039cb
--- /dev/null
+++ b/salt/role/salt/master.sls
@@ -0,0 +1,2 @@
+include:
+  - profile.salt.master