diff --git a/inventory/group_vars/koschei b/inventory/group_vars/koschei
index 4ee168043a..5c554e4a1f 100644
--- a/inventory/group_vars/koschei
+++ b/inventory/group_vars/koschei
@@ -7,6 +7,11 @@ num_cpus: 4
 # for systems that do not match the above - specify the same parameter in
 # the host_vars/$hostname file
 
+koschei_pgsql_hostname: FIXME
+koschei_koji_hub: koji02.phx2.fedoraproject.org
+koschei_kojipkgs: kojipkgs.fedoraproject.org
+koschei_koji_tag: f23
+
 tcp_ports: [ 80, 443 ]
 
 custom_rules: [
diff --git a/inventory/group_vars/koschei-stg b/inventory/group_vars/koschei-stg
index 4ee168043a..29c9de9d65 100644
--- a/inventory/group_vars/koschei-stg
+++ b/inventory/group_vars/koschei-stg
@@ -1,12 +1,17 @@
 ---
 # Define resources for this group of hosts here.
 lvm_size: 20000
-mem_size: 4096
-num_cpus: 4
+mem_size: 2048
+num_cpus: 2
 
 # for systems that do not match the above - specify the same parameter in
 # the host_vars/$hostname file
 
+koschei_pgsql_hostname: db01.stg.phx2.fedoraproject.org
+koschei_koji_hub: koji01.stg.phx2.fedoraproject.org
+koschei_kojipkgs: koji01.stg.phx2.fedoraproject.org
+koschei_koji_tag: f23
+
 tcp_ports: [ 80, 443 ]
 
 custom_rules: [
diff --git a/inventory/host_vars/koschei01.stg.phx2.fedoraproject.org b/inventory/host_vars/koschei01.stg.phx2.fedoraproject.org
index 251ce57859..d9cd3d03c5 100644
--- a/inventory/host_vars/koschei01.stg.phx2.fedoraproject.org
+++ b/inventory/host_vars/koschei01.stg.phx2.fedoraproject.org
@@ -10,12 +10,3 @@ volgroup: /dev/vg_guests
 eth0_ip: 10.5.126.221
 vmhost: virthost11.phx2.fedoraproject.org
 datacenter: phx2
-
-# stg needs less resources than prod
-mem_size: 2048
-num_cpus: 2
-
-koschei_pgsql_hostname: db01.stg.phx2.fedoraproject.org
-koschei_koji_hub: koji01.stg.phx2.fedoraproject.org
-koschei_kojipkgs: koji01.stg.phx2.fedoraproject.org
-koschei_koji_tag: f23