diff --git a/pillar/common.sls b/pillar/common.sls
index 3f98d24..75d87f7 100644
--- a/pillar/common.sls
+++ b/pillar/common.sls
@@ -8,7 +8,54 @@ timezone:
   name: 'UTC'
   utc: True
 salt:
+  gitfs:
+    libgit2:
+      install_from_source: False
+    pygit2:
+      install_from_source: False
+  master:
+    cli_summary: True
+    default_top: production
+    env_order:
+      - production
+    ext_pillar:
+      - git:
+          - production gitlab@gitlab.opensuse.org/infa/salt.git
+              - env: production
+              - root: pillar
+              - privkey: /srv/salt/.ssh/salt_gitlab_oo_infra_salt
+              - pubkey: /srv/salt/.ssh/salt_gitlab_oo_infra_salt.pub
+    ext_pillar_first: True
+    fileserver_backend:
+      - git
+    gitfs_provider: pygit2
+    gitfs_remotes:
+      - gitlab@gitlab.opensuse.org/infra/salt.git
+          - root: salt
+          - privkey: /srv/salt/.ssh/salt_gitlab_oo_infra_salt
+          - pubkey: /srv/salt/.ssh/salt_gitlab_oo_infra_salt.pub
+      - https://gitlab.opensuse.org/saltstack-formulas/dhcpd-formula.git
+      - https://gitlab.opensuse.org/saltstack-formulas/grains-formula.git
+      - https://gitlab.opensuse.org/saltstack-formulas/keepalived-formula.git
+      - https://gitlab.opensuse.org/saltstack-formulas/locale-formula.git
+      - https://gitlab.opensuse.org/saltstack-formulas/ntp-formula.git
+      - https://gitlab.opensuse.org/saltstack-formulas/openssh-formula.git
+      - https://gitlab.opensuse.org/saltstack-formulas/salt-formula.git
+      - https://gitlab.opensuse.org/saltstack-formulas/sudoers-formula.git
+      - https://gitlab.opensuse.org/saltstack-formulas/users-formula.git
+      - https://gitlab.opensuse.org/saltstack-formulas/timezone-formula.git
+    gitfs_ssl_verify: True
+    pillar_gitfs_ssl_verify: True
+    pillar_merge_lists: True
+    pillar_source_merging_strategy: smart
+    state_output: changes
+    state_verbose: False
+    top_file_merging_strategy: same
+    user: salt
   minion:
     backup_mode: minion
     environment: production
     hash_type: sha512
+  reactor:
+    - 'salt/fileserver/gitfs/update':
+      - /srv/reactor/update_fileserver.sls
diff --git a/pillar/id/minnie_opensuse_org.sls b/pillar/id/minnie_opensuse_org.sls
index 2b4e48f..93ecd00 100644
--- a/pillar/id/minnie_opensuse_org.sls
+++ b/pillar/id/minnie_opensuse_org.sls
@@ -3,3 +3,5 @@ grains:
   country: de
   salt_cluster: opensuse
   virt_cluster: atreju
+  roles:
+    - saltmaster
diff --git a/salt/profile/salt/files/reactor/update_fileserver.sls b/salt/profile/salt/files/reactor/update_fileserver.sls
new file mode 100644
index 0000000..cdc76d2
--- /dev/null
+++ b/salt/profile/salt/files/reactor/update_fileserver.sls
@@ -0,0 +1,2 @@
+update_fileserver:
+  runner.fileserver.update
diff --git a/salt/profile/salt/master.sls b/salt/profile/salt/master.sls
new file mode 100644
index 0000000..44df3f7
--- /dev/null
+++ b/salt/profile/salt/master.sls
@@ -0,0 +1,16 @@
+include:
+  - salt.master
+
+remove-etc-salt-master:
+  file.managed:
+    - name: /etc/salt/master
+    - template: jinja
+    - source: salt://profile/salt/files/master_minion_default_config
+    - defaults:
+        salt_service: master
+    - listen_in:
+        - service: salt-master
+
+/srv/reactor:
+  file.recurse:
+    - source: salt://profile/salt/files/reactor
diff --git a/salt/role/saltmaster.sls b/salt/role/saltmaster.sls
new file mode 100644
index 0000000..48039cb
--- /dev/null
+++ b/salt/role/saltmaster.sls
@@ -0,0 +1,2 @@
+include:
+  - profile.salt.master