diff --git a/playbooks/openshift-apps/koschei.yml b/playbooks/openshift-apps/koschei.yml
index 74b516fcdc..456484410d 100644
--- a/playbooks/openshift-apps/koschei.yml
+++ b/playbooks/openshift-apps/koschei.yml
@@ -5,12 +5,10 @@
 
   vars_files:
     - /srv/web/infra/ansible/vars/global.yml
-    - "/srv/private/ansible/vars.yml"
+    - /srv/private/ansible/vars.yml
     - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
+    - {{ roles_path }}/openshift-apps/koschei/vars/main.yml
+    - {{ roles_path }}/openshift-apps/koschei/vars/{{ env }}.yml
 
   roles:
-  - role: openshift/project
-    app: koschei
-    description: koschei
-    appowners:
-    - mizdebsk
+  - openshift/project
diff --git a/roles/openshift-apps/koschei/vars/main.yml b/roles/openshift-apps/koschei/vars/main.yml
new file mode 100644
index 0000000000..4ad977d045
--- /dev/null
+++ b/roles/openshift-apps/koschei/vars/main.yml
@@ -0,0 +1,4 @@
+app: koschei
+description: koschei
+appowners:
+  - mizdebsk
diff --git a/roles/openshift-apps/koschei/vars/staging.yml b/roles/openshift-apps/koschei/vars/staging.yml
new file mode 100644
index 0000000000..e69de29bb2