diff --git a/pillar/role/common/wiki.sls b/pillar/role/common/wiki.sls
new file mode 100644
index 0000000..0047744
--- /dev/null
+++ b/pillar/role/common/wiki.sls
@@ -0,0 +1,14 @@
+sudoers:
+  included_files:
+    /etc/sudoers.d/group_wiki-admins:
+      groups:
+        wiki-admins:
+          - 'ALL=(ALL) ALL'
+
+zypper:
+  repositories:
+    openSUSE:infrastructure:wiki:
+      baseurl: http://download.infra.opensuse.org/repositories/openSUSE:/infrastructure:/wiki/openSUSE_Leap_{{ salt['grains.get']('osrelease') }}
+      gpgcheck: 0
+      priority: 100
+      refresh: True
diff --git a/pillar/role/wiki.sls b/pillar/role/wiki.sls
index 0c78a13..4c74686 100644
--- a/pillar/role/wiki.sls
+++ b/pillar/role/wiki.sls
@@ -1,3 +1,6 @@
+include:
+  - role.common.wiki
+
 apparmor:
   profiles:
     httpd2-prefork:
@@ -95,13 +98,6 @@ mediawiki_1_27:
 # zh_tw -> bento_lang zh_TW
 # full bento_lang list: https://github.com/openSUSE/opensuse-themes/tree/master/bento/js/l10n
 
-sudoers:
-  included_files:
-    /etc/sudoers.d/group_wiki-admins:
-      groups:
-        wiki-admins:
-          - 'ALL=(ALL) ALL'
-
 zypper:
   packages:
     apache2: {}
@@ -111,9 +107,3 @@ zypper:
     mariadb-client: {}
     # needed for migration to unpack tarballs
     tar: {}
-  repositories:
-    openSUSE:infrastructure:wiki:
-      baseurl: http://download.infra.opensuse.org/repositories/openSUSE:/infrastructure:/wiki/openSUSE_Leap_{{ salt['grains.get']('osrelease') }}
-      gpgcheck: 0
-      priority: 100
-      refresh: True
diff --git a/pillar/role/wikisearch.sls b/pillar/role/wikisearch.sls
index 60b80fa..74ffbef 100644
--- a/pillar/role/wikisearch.sls
+++ b/pillar/role/wikisearch.sls
@@ -1,3 +1,6 @@
+include:
+  - role.common.wiki
+
 apparmor:
   profiles:
     elasticsearch:
@@ -39,18 +42,3 @@ elasticsearch:
     RESTART_ON_UPGRADE: true
     WORK_DIR: /tmp/elasticsearch
   version: 1.7.6
-
-sudoers:
-  included_files:
-    /etc/sudoers.d/group_wiki-admins:
-      groups:
-        wiki-admins:
-          - 'ALL=(ALL) ALL'
-
-zypper:
-  repositories:
-    openSUSE:infrastructure:wiki:
-      baseurl: http://download.infra.opensuse.org/repositories/openSUSE:/infrastructure:/wiki/openSUSE_Leap_{{ salt['grains.get']('osrelease') }}
-      gpgcheck: 0
-      priority: 100
-      refresh: True