diff --git a/group_vars/all/vars.yml b/group_vars/all/vars.yml
new file mode 100644
index 0000000..4bd7f0e
--- /dev/null
+++ b/group_vars/all/vars.yml
@@ -0,0 +1,7 @@
+# vim: ft=yaml.ansible
+# code: language=ansible
+---
+encrypted_fs: /data
+hostname: "{{ inventory_hostname }}"
+timezone: Europe/Copenhagen
+username: lab_admin
diff --git a/inventories/production/group_vars/appservers/vars.yml b/group_vars/appservers/vars.yml
similarity index 78%
rename from inventories/production/group_vars/appservers/vars.yml
rename to group_vars/appservers/vars.yml
index 728b968..222bac4 100644
--- a/inventories/production/group_vars/appservers/vars.yml
+++ b/group_vars/appservers/vars.yml
@@ -1,6 +1,8 @@
 # vim: ft=yaml.ansible
 # code: language=ansible
 ---
+apps_data_root: "{{ encrypted_fs }}/apps"
 apps_base_domain: "{{ base_domain }}"
 apps_local_domain: "{{ local_domain }}"
-apps_data_root: "{{ encrypted_fs }}/apps"
+
+docker_data_root: "{{ encrypted_fs }}/docker"
diff --git a/inventories/production/group_vars/dbservers/vars.yml b/group_vars/dbservers/vars.yml
similarity index 100%
rename from inventories/production/group_vars/dbservers/vars.yml
rename to group_vars/dbservers/vars.yml
diff --git a/group_vars/production/vars.yml b/group_vars/production/vars.yml
new file mode 100644
index 0000000..defb3c5
--- /dev/null
+++ b/group_vars/production/vars.yml
@@ -0,0 +1,5 @@
+# vim: ft=yaml.ansible
+# code: language=ansible
+---
+base_domain: sapti.me
+local_domain: local.{{ base_domain }}
diff --git a/group_vars/shared/vars.yml b/group_vars/shared/vars.yml
new file mode 100644
index 0000000..defb3c5
--- /dev/null
+++ b/group_vars/shared/vars.yml
@@ -0,0 +1,5 @@
+# vim: ft=yaml.ansible
+# code: language=ansible
+---
+base_domain: sapti.me
+local_domain: local.{{ base_domain }}
diff --git a/group_vars/staging/vars.yml b/group_vars/staging/vars.yml
new file mode 100644
index 0000000..66e9979
--- /dev/null
+++ b/group_vars/staging/vars.yml
@@ -0,0 +1,5 @@
+# vim: ft=yaml.ansible
+# code: language=ansible
+---
+base_domain: staging.sapti.me
+local_domain: local.{{ base_domain }}
diff --git a/inventories/production/host_vars/sapt-labp-app01.yml b/host_vars/sapt-labp-app01.yml
similarity index 100%
rename from inventories/production/host_vars/sapt-labp-app01.yml
rename to host_vars/sapt-labp-app01.yml
diff --git a/inventories/production/host_vars/sapt-labp-app02.yml b/host_vars/sapt-labp-app02.yml
similarity index 100%
rename from inventories/production/host_vars/sapt-labp-app02.yml
rename to host_vars/sapt-labp-app02.yml
diff --git a/inventories/staging/host_vars/sapt-labs-app01.yml b/host_vars/sapt-labs-app01.yml
similarity index 100%
rename from inventories/staging/host_vars/sapt-labs-app01.yml
rename to host_vars/sapt-labs-app01.yml
diff --git a/inventories/staging/host_vars/sapt-labs-app02.yml b/host_vars/sapt-labs-app02.yml
similarity index 100%
rename from inventories/staging/host_vars/sapt-labs-app02.yml
rename to host_vars/sapt-labs-app02.yml
diff --git a/inventories/production/group_vars/all/secrets.yml b/inventories/production/group_vars/all/secrets.yml
deleted file mode 100644
index 7d7dbd2..0000000
--- a/inventories/production/group_vars/all/secrets.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-65653764303436313934646462396636636335303334636532306438613635333362313530323731
-3236383962303039393238646362626665613463666335610a353261343163663934353366656630
-65356562616661326535626238373635366233326366343631386165653735373637656330343735
-3330376331306633300a393530313436653737366630336165653839616437626531346331653466
-35626530373932303962333933626265326166656136623139666533643934653666383436383838
-35643430383763323038646461313563373462353736376137323230613338613430303763376164
-32633833653236323561643636373461353932663232663561636164383361663361346263376436
-33346335323530666436393538326531623931643838633631646137306563306630336238333166
-34346634306337313938626632663131333534356631386564363233643339623338363539326262
-62336331646134626439313032626231383833353831343038393739366435663766333262633461
-61383830656566666262376162376637313933336533396664303830306266323234323463613966
-33383864393964323866613937623331343966373432643732383663343335316562326637353837
-32646362613631633263386566353930363665353361353934393537353461383333343331356639
-31633861346635386432363835373736363133303266383835633436313533393835616231313165
-62363835623866323961313664333430656131373061373764316331343639653437633037636339
-37656363366137666138333835353661613363333963333134313338386362656435633063353538
-64346464336230323131346537653565383630613532356264633035363962303131663036343065
-31363536366362303164373339333462653166333031616362653631383234303836613532633332
-64333337343362613161626166393634636336373265643561323230383534326663643536366333
-63393230343735346631306461653636396634343864623532306661326564633661623131346639
-38363331613463616266633863303161326237313037643934383032663834366634363965396238
-63633330636130373331393533393531623535656361306165623539383962653839353334643233
-35663566383434396135323531353230643763326134323865343863616461326530353963376232
-31373965353732386630366130656266623464666333383433393062613366363136333933343461
-61323832626466386433636134383765383834643536363635623830303535646530613238343437
-36363566396465313830326137396532393762623436646663643663393266396631363663343936
-32383561643237386630353730323563313636663633623036363131366139396235343138306134
-66653538663937616266343065333366613236313235346635326337633866363263313832653732
-35663634363432383066386561663661643265613532386165646230313531356535353165343666
-38663764643439633664353439366536323763663063626664623365613734386265393934383532
-66323963303133653465366138666132666339353630323739383633383462373532323762663432
-30643436376539303430343164663238376634346437623063656466653138626237663538626436
-30623836393362666231323435383238643731623931396235346330323539643966663365363632
-65646564656563303064643161353930396663363638383965616662663238646434373862316430
-39343932656532626631323035633563373730393163396338653064326631626436373533333734
-65626361346162383530626134336230346234653936366462393538353137373933376533313839
-34383932343637623262373134636233373839313339393433303337363566643833353066396337
-66643966373436393937363064353365363239323461653034626161383936303236313364366535
-65316335333235623463613766633836643730363634666465386663386235306334376364323162
-39333466383333643339633538336632376333623439646234643666333162326135663130303536
-39663234633761633632346534383966313234613763323038626466346235333165303934633431
-36313565346631623166383338643739346634393663303264373962343932376430663333376165
-62613462396531323634613966616331623538306636343235393362396437633239366136616436
-65323638393566363034633231643565636431356431386234316233636266663136656139663532
-38613637636432626236323066643632343661316565343361323764353335313265383831373764
-64323361333463346438626134323166623231393338373333653161623663336434383931393163
-36633163393235636435323931313265633234623433653134616132346262653234636364376238
-66313761333436336663323663626563656566366665336439643461623837666338313565313964
-31666466663863623334316164316432353362316336616662666666363766306231653664306663
-37613839383864386533326634336433633464343831303835656366616339393332633965323431
-65643136643866653834353538356233623662663237303261333564346566643839633532366262
-66653162366563666463353533656665323661326566383966306332626566663732353730313732
-65323034326161306165613364336336386265313735396237623633346263333966
diff --git a/inventories/production/group_vars/all/vars.yml b/inventories/production/group_vars/all/vars.yml
deleted file mode 100644
index b96cd9b..0000000
--- a/inventories/production/group_vars/all/vars.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# vim: ft=yaml.ansible
-# code: language=ansible
----
-base_domain: sapti.me
-local_domain: local.{{ base_domain }}
-
-encrypted_fs: /data
-docker_data_root: "{{ encrypted_fs }}/docker"
-
-hostname: "{{ inventory_hostname_short }}"
-timezone: Europe/Copenhagen
-username: lab_admin
diff --git a/inventories/production/hosts b/inventories/production/hosts
deleted file mode 100644
index 1a6d1f0..0000000
--- a/inventories/production/hosts
+++ /dev/null
@@ -1,6 +0,0 @@
-[appservers]
-sapt-labp-app01.servers.local.sapti.me
-sapt-labp-app02.servers.local.sapti.me
-
-[dbservers]
-sapt-labp-db01.servers.local.sapti.me
\ No newline at end of file
diff --git a/inventories/shared/hosts b/inventories/shared/hosts
deleted file mode 100644
index 05cf742..0000000
--- a/inventories/shared/hosts
+++ /dev/null
@@ -1,5 +0,0 @@
-[proxyservers]
-sapt-labn-prx01.servers.local.sapti.me
-
-[monitoringservers]
-sapt-labn-mon01.servers.local.sapti.me
\ No newline at end of file
diff --git a/inventories/staging/group_vars/all/secrets.yml b/inventories/staging/group_vars/all/secrets.yml
deleted file mode 100644
index 7d7dbd2..0000000
--- a/inventories/staging/group_vars/all/secrets.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-65653764303436313934646462396636636335303334636532306438613635333362313530323731
-3236383962303039393238646362626665613463666335610a353261343163663934353366656630
-65356562616661326535626238373635366233326366343631386165653735373637656330343735
-3330376331306633300a393530313436653737366630336165653839616437626531346331653466
-35626530373932303962333933626265326166656136623139666533643934653666383436383838
-35643430383763323038646461313563373462353736376137323230613338613430303763376164
-32633833653236323561643636373461353932663232663561636164383361663361346263376436
-33346335323530666436393538326531623931643838633631646137306563306630336238333166
-34346634306337313938626632663131333534356631386564363233643339623338363539326262
-62336331646134626439313032626231383833353831343038393739366435663766333262633461
-61383830656566666262376162376637313933336533396664303830306266323234323463613966
-33383864393964323866613937623331343966373432643732383663343335316562326637353837
-32646362613631633263386566353930363665353361353934393537353461383333343331356639
-31633861346635386432363835373736363133303266383835633436313533393835616231313165
-62363835623866323961313664333430656131373061373764316331343639653437633037636339
-37656363366137666138333835353661613363333963333134313338386362656435633063353538
-64346464336230323131346537653565383630613532356264633035363962303131663036343065
-31363536366362303164373339333462653166333031616362653631383234303836613532633332
-64333337343362613161626166393634636336373265643561323230383534326663643536366333
-63393230343735346631306461653636396634343864623532306661326564633661623131346639
-38363331613463616266633863303161326237313037643934383032663834366634363965396238
-63633330636130373331393533393531623535656361306165623539383962653839353334643233
-35663566383434396135323531353230643763326134323865343863616461326530353963376232
-31373965353732386630366130656266623464666333383433393062613366363136333933343461
-61323832626466386433636134383765383834643536363635623830303535646530613238343437
-36363566396465313830326137396532393762623436646663643663393266396631363663343936
-32383561643237386630353730323563313636663633623036363131366139396235343138306134
-66653538663937616266343065333366613236313235346635326337633866363263313832653732
-35663634363432383066386561663661643265613532386165646230313531356535353165343666
-38663764643439633664353439366536323763663063626664623365613734386265393934383532
-66323963303133653465366138666132666339353630323739383633383462373532323762663432
-30643436376539303430343164663238376634346437623063656466653138626237663538626436
-30623836393362666231323435383238643731623931396235346330323539643966663365363632
-65646564656563303064643161353930396663363638383965616662663238646434373862316430
-39343932656532626631323035633563373730393163396338653064326631626436373533333734
-65626361346162383530626134336230346234653936366462393538353137373933376533313839
-34383932343637623262373134636233373839313339393433303337363566643833353066396337
-66643966373436393937363064353365363239323461653034626161383936303236313364366535
-65316335333235623463613766633836643730363634666465386663386235306334376364323162
-39333466383333643339633538336632376333623439646234643666333162326135663130303536
-39663234633761633632346534383966313234613763323038626466346235333165303934633431
-36313565346631623166383338643739346634393663303264373962343932376430663333376165
-62613462396531323634613966616331623538306636343235393362396437633239366136616436
-65323638393566363034633231643565636431356431386234316233636266663136656139663532
-38613637636432626236323066643632343661316565343361323764353335313265383831373764
-64323361333463346438626134323166623231393338373333653161623663336434383931393163
-36633163393235636435323931313265633234623433653134616132346262653234636364376238
-66313761333436336663323663626563656566366665336439643461623837666338313565313964
-31666466663863623334316164316432353362316336616662666666363766306231653664306663
-37613839383864386533326634336433633464343831303835656366616339393332633965323431
-65643136643866653834353538356233623662663237303261333564346566643839633532366262
-66653162366563666463353533656665323661326566383966306332626566663732353730313732
-65323034326161306165613364336336386265313735396237623633346263333966
diff --git a/inventories/staging/group_vars/all/vars.yml b/inventories/staging/group_vars/all/vars.yml
deleted file mode 100644
index 20bdfe5..0000000
--- a/inventories/staging/group_vars/all/vars.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# vim: ft=yaml.ansible
-# code: language=ansible
----
-base_domain: staging.sapti.me
-local_domain: local.{{ base_domain }}
-
-encrypted_fs: /data
-docker_data_root: "{{ encrypted_fs }}/docker"
-
-hostname: "{{ inventory_hostname_short }}"
-timezone: Europe/Copenhagen
-username: lab_admin
diff --git a/inventories/staging/group_vars/appservers/vars.yml b/inventories/staging/group_vars/appservers/vars.yml
deleted file mode 100644
index 728b968..0000000
--- a/inventories/staging/group_vars/appservers/vars.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-# vim: ft=yaml.ansible
-# code: language=ansible
----
-apps_base_domain: "{{ base_domain }}"
-apps_local_domain: "{{ local_domain }}"
-apps_data_root: "{{ encrypted_fs }}/apps"
diff --git a/inventories/staging/group_vars/dbservers/vars.yml b/inventories/staging/group_vars/dbservers/vars.yml
deleted file mode 100644
index ef48fc4..0000000
--- a/inventories/staging/group_vars/dbservers/vars.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-# vim: ft=yaml.ansible
-# code: language=ansible
----
-db_data_root: "{{ encrypted_fs }}/db"
diff --git a/inventories/staging/hosts b/inventories/staging/hosts
deleted file mode 100644
index cb83b06..0000000
--- a/inventories/staging/hosts
+++ /dev/null
@@ -1,6 +0,0 @@
-[appservers]
-sapt-labs-app01.servers.local.sapti.me
-sapt-labs-app02.servers.local.sapti.me
-
-[dbservers]
-sapt-labs-db01.servers.local.sapti.me
diff --git a/inventory.ini b/inventory.ini
new file mode 100644
index 0000000..4403425
--- /dev/null
+++ b/inventory.ini
@@ -0,0 +1,39 @@
+[app_prod]
+sapt-labp-app01     ansible_host=sapt-labp-app01.servers.local.sapti.me
+sapt-labp-app02     ansible_host=sapt-labp-app02.servers.local.sapti.me
+
+[db_prod]
+sapt-labp-db01      ansible_host=sapt-labp-db01.servers.local.sapti.me
+
+[app_stage]
+sapt-labs-app01     ansible_host=sapt-labs-app01.servers.local.sapti.me
+sapt-labs-app02     ansible_host=sapt-labs-app02.servers.local.sapti.me
+
+[db_stage]
+sapt-labs-db01      ansible_host=sapt-labs-db01.servers.local.sapti.me
+
+[proxy_shd]
+sapt-labn-prx01     ansible_host=sapt-labn-prx01.servers.local.sapti.me
+
+[monitoring_shd]
+sapt-labn-mon01     ansible_host=sapt-labn-mon01.servers.local.sapti.me
+
+[production:children]
+app_prod
+db_prod
+
+[staging:children]
+app_stage
+db_stage
+
+[shared:children]
+proxy_shd
+monitoring_shd
+
+[appservers:children]
+app_prod
+app_stage
+
+[dbservers:children]
+db_prod
+db_stage
\ No newline at end of file