diff --git a/playbooks/groups/koschei.yml b/playbooks/groups/koschei.yml
index 0dce075514..f45414a098 100644
--- a/playbooks/groups/koschei.yml
+++ b/playbooks/groups/koschei.yml
@@ -19,7 +19,8 @@
   - builder_repo
   - collectd/base
   - apache
-  - koschei
+  - koschei/backend
+  - koschei/frontend
   - fedmsg/base
   - sudo
   - { role: openvpn/client, when: env != "staging" }
diff --git a/roles/koschei/files/koschei.py b/roles/koschei/backend/files/koschei.py
similarity index 100%
rename from roles/koschei/files/koschei.py
rename to roles/koschei/backend/files/koschei.py
diff --git a/roles/koschei/handlers/main.yml b/roles/koschei/backend/handlers/main.yml
similarity index 100%
rename from roles/koschei/handlers/main.yml
rename to roles/koschei/backend/handlers/main.yml
diff --git a/roles/koschei/tasks/main.yml b/roles/koschei/backend/tasks/main.yml
similarity index 79%
rename from roles/koschei/tasks/main.yml
rename to roles/koschei/backend/tasks/main.yml
index 67b3885bce..deb36739c9 100644
--- a/roles/koschei/tasks/main.yml
+++ b/roles/koschei/backend/tasks/main.yml
@@ -1,14 +1,6 @@
-- name: Install jenkins repo on stg
-  copy: src=jenkins.repo dest=/etc/yum.repos.d/jenkins.repo
-  when: env == "staging"
-  tags:
-  - koschei
-  - config
-  - packages
-  - yumrepos
-
 - name: install packages
   package: name={{ item }} state=installed
+  when: env != "staging"
   with_items:
   - koschei
   - lbzip2
@@ -17,6 +9,17 @@
   - koschei
   - packages
 
+- name: install packages
+  package: name={{ item }} state=installed
+  when: env == "staging"
+  with_items:
+  - koschei-admin
+  - koschei-backend
+  - postgresql
+  tags:
+  - koschei
+  - packages
+
 - name: install config files
   template: >
     src="{{ item }}.j2"
@@ -32,7 +35,6 @@
   - restart koschei-resolver
   - restart koschei-scheduler
   - restart koschei-watcher
-  - reload httpd
   tags:
   - koschei
   - config
@@ -74,7 +76,6 @@
   - restart koschei-resolver
   - restart koschei-scheduler
   - restart koschei-watcher
-  - reload httpd
   tags:
   - koschei
   - config
@@ -87,16 +88,6 @@
   - koschei
   - config
 
-- name: install httpd config file
-  template: >
-    src="httpd.conf.j2"
-    dest="/etc/httpd/conf.d/koschei.conf"
-  notify:
-  - reload httpd
-  tags:
-  - koschei
-  - config
-
 - name: enable services to start on boot
   service: name={{ item }} state=running enabled=true
   with_items:
@@ -108,17 +99,6 @@
   - koschei
   - service
 
-- name: allow httpd to connect to db
-  seboolean: name={{ item }} state=yes persistent=yes
-  with_items:
-  - httpd_can_network_connect
-  - httpd_can_network_connect_db
-  notify:
-  - reload httpd
-  tags:
-  - koschei
-  - selinux
-
 - name: Copy the cleanup cronjob
   template: src=cron-db-cleanup.j2 dest=/etc/cron.d/cron-db-cleanup
   tags:
diff --git a/roles/koschei/templates/config-admin.cfg.j2 b/roles/koschei/backend/templates/config-admin.cfg.j2
similarity index 100%
rename from roles/koschei/templates/config-admin.cfg.j2
rename to roles/koschei/backend/templates/config-admin.cfg.j2
diff --git a/roles/koschei/templates/config.cfg.j2 b/roles/koschei/backend/templates/config.cfg.j2
similarity index 100%
rename from roles/koschei/templates/config.cfg.j2
rename to roles/koschei/backend/templates/config.cfg.j2
diff --git a/roles/koschei/templates/cron-db-cleanup.j2 b/roles/koschei/backend/templates/cron-db-cleanup.j2
similarity index 100%
rename from roles/koschei/templates/cron-db-cleanup.j2
rename to roles/koschei/backend/templates/cron-db-cleanup.j2
diff --git a/roles/koschei/templates/koji.conf.j2 b/roles/koschei/backend/templates/koji.conf.j2
similarity index 100%
rename from roles/koschei/templates/koji.conf.j2
rename to roles/koschei/backend/templates/koji.conf.j2
diff --git a/roles/koschei/templates/pgpass.j2 b/roles/koschei/backend/templates/pgpass.j2
similarity index 100%
rename from roles/koschei/templates/pgpass.j2
rename to roles/koschei/backend/templates/pgpass.j2
diff --git a/roles/koschei/files/jenkins.repo b/roles/koschei/files/jenkins.repo
deleted file mode 100644
index 539275fef2..0000000000
--- a/roles/koschei/files/jenkins.repo
+++ /dev/null
@@ -1,5 +0,0 @@
-[koschei-jenkins]
-name=koschei-jenkins
-baseurl=http://jenkins.fedorainfracloud.org/job/koschei-rpm/ws/rpms/
-enabled=0
-gpgcheck=0
diff --git a/roles/koschei/frontend/tasks/main.yml b/roles/koschei/frontend/tasks/main.yml
new file mode 100644
index 0000000000..557ab59fec
--- /dev/null
+++ b/roles/koschei/frontend/tasks/main.yml
@@ -0,0 +1,55 @@
+- name: install packages
+  package: name={{ item }} state=installed
+  when: env != "staging"
+  with_items:
+  - koschei
+  - lbzip2
+  - postgresql
+  tags:
+  - koschei
+  - packages
+
+- name: install packages
+  package: name={{ item }} state=installed
+  when: env == "staging"
+  with_items:
+  - koschei-frontend
+  tags:
+  - koschei
+  - packages
+
+- name: install config files
+  template: >
+    src="{{ item }}.j2"
+    dest="/etc/koschei/{{ item }}"
+    owner=koschei
+    group=koschei
+    mode=0400
+  with_items:
+  - config.cfg
+  notify:
+  - reload httpd
+  tags:
+  - koschei
+  - config
+
+- name: install httpd config file
+  template: >
+    src="httpd.conf.j2"
+    dest="/etc/httpd/conf.d/koschei.conf"
+  notify:
+  - reload httpd
+  tags:
+  - koschei
+  - config
+
+- name: allow httpd to connect to db
+  seboolean: name={{ item }} state=yes persistent=yes
+  with_items:
+  - httpd_can_network_connect
+  - httpd_can_network_connect_db
+  notify:
+  - reload httpd
+  tags:
+  - koschei
+  - selinux
diff --git a/roles/koschei/frontend/templates/config.cfg.j2 b/roles/koschei/frontend/templates/config.cfg.j2
new file mode 120000
index 0000000000..6a230aa865
--- /dev/null
+++ b/roles/koschei/frontend/templates/config.cfg.j2
@@ -0,0 +1 @@
+../../backend/templates/config.cfg.j2
\ No newline at end of file
diff --git a/roles/koschei/templates/httpd.conf.j2 b/roles/koschei/frontend/templates/httpd.conf.j2
similarity index 100%
rename from roles/koschei/templates/httpd.conf.j2
rename to roles/koschei/frontend/templates/httpd.conf.j2