diff --git a/group_vars/app_prod/vars.yml b/group_vars/app_prod/vars.yml
deleted file mode 100644
index 06d3b7a..0000000
--- a/group_vars/app_prod/vars.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-# vim: ft=yaml.ansible
-# code: language=ansible
----
-apps_base_domain: sapti.me
-
-db_inventory_hostname: sapt-labp-db01
-db_host: "{{ hostvars[db_inventory_hostname].internal_ipv4 }}"
-
-proxy_inventory_hostname: sapt-labr-prx01
-proxy_host: "{{ hostvars[proxy_inventory_hostname].internal_ipv4 }}"
diff --git a/group_vars/app_stage/vars.yml b/group_vars/app_stage/vars.yml
deleted file mode 100644
index 1a3a737..0000000
--- a/group_vars/app_stage/vars.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-# vim: ft=yaml.ansible
-# code: language=ansible
----
-apps_base_domain: staging.sapti.me
-
-db_inventory_hostname: sapt-labs-db01
-db_host: "{{ hostvars[db_inventory_hostname].internal_ipv4 }}"
-
-proxy_inventory_hostname: sapt-labr-prx01
-proxy_host: "{{ hostvars[proxy_inventory_hostname].internal_ipv4 }}"
diff --git a/group_vars/production/vars.yml b/group_vars/production/vars.yml
index 52c0c16..ba34061 100644
--- a/group_vars/production/vars.yml
+++ b/group_vars/production/vars.yml
@@ -1,6 +1,7 @@
 # vim: ft=yaml.ansible
 # code: language=ansible
 ---
+apps_base_domain: sapti.me
 internal_subnet: 10.2.16.0/24
 postgresql_version: 14
 
@@ -8,3 +9,9 @@ databases:
   nextcloud:
     username: nextcloud
     password: "{{ vault_db_passwords.nextcloud }}"
+
+db_inventory_hostname: sapt-labp-db01
+db_host: "{{ hostvars[db_inventory_hostname].internal_ipv4 }}"
+
+proxy_inventory_hostname: sapt-labr-prx01
+proxy_host: "{{ hostvars[proxy_inventory_hostname].internal_ipv4 }}"
diff --git a/group_vars/publicservers/vars.yml b/group_vars/publicservers/vars.yml
new file mode 100644
index 0000000..6a04d69
--- /dev/null
+++ b/group_vars/publicservers/vars.yml
@@ -0,0 +1,4 @@
+# vim: ft=yaml.ansible
+# code: language=ansible
+---
+apps_base_domain: sapti.me
diff --git a/group_vars/staging/vars.yml b/group_vars/staging/vars.yml
index dcb97a4..12b00b4 100644
--- a/group_vars/staging/vars.yml
+++ b/group_vars/staging/vars.yml
@@ -1,6 +1,7 @@
 # vim: ft=yaml.ansible
 # code: language=ansible
 ---
+apps_base_domain: staging.sapti.me
 internal_subnet: 10.2.19.0/24
 postgresql_version: 14
 
@@ -8,3 +9,9 @@ databases:
   nextcloud:
     username: nextcloud
     password: "{{ vault_db_passwords.nextcloud }}"
+
+db_inventory_hostname: sapt-labs-db01
+db_host: "{{ hostvars[db_inventory_hostname].internal_ipv4 }}"
+
+proxy_inventory_hostname: sapt-labr-prx01
+proxy_host: "{{ hostvars[proxy_inventory_hostname].internal_ipv4 }}"
diff --git a/site.yml b/site.yml
index 006248e..8a62f08 100644
--- a/site.yml
+++ b/site.yml
@@ -21,7 +21,8 @@
     - name: Include role 'apps'
       ansible.builtin.include_role:
         name: apps
-      when: hostname in groups['appservers']
+      when: hostname in groups['appservers'] or
+            hostname in groups['publicservers']
 
     - name: Include role 'postgresql'
       ansible.builtin.include_role: