diff --git a/roles/sys-stk-full/tasks/main.yml b/roles/sys-stk-full/tasks/main.yml
index d5924ec842..7ab5c41f28 100644
--- a/roles/sys-stk-full/tasks/main.yml
+++ b/roles/sys-stk-full/tasks/main.yml
@@ -15,13 +15,14 @@
       }}
   changed_when: false
 
-- name: "For '{{ application_id }}': include role sys-stk-front-proxy"
+- name: "For '{{ application_id }}': include role sys-stk-front-proxy (only on openresty host)"
   include_role:
     name: sys-stk-front-proxy
   vars:
     application_id: "{{ sys_stk_full_application_id }}"
     domain: "{{ sys_stk_full_domain }}"
     http_port: "{{ sys_stk_full_http_port }}"
+  when: inventory_hostname in (groups['svc-prx-openresty'] | default([]))
 
 - name: "For '{{ application_id }}': load docker and db"
   include_role:
diff --git a/roles/sys-svc-rdbms/tasks/main.yml b/roles/sys-svc-rdbms/tasks/main.yml
index 3cf53b6984..b9029c56d0 100644
--- a/roles/sys-svc-rdbms/tasks/main.yml
+++ b/roles/sys-svc-rdbms/tasks/main.yml
@@ -8,7 +8,7 @@
 - name: "For '{{ application_id }}/{{ _database_consumer_id }}': Resolve shared database mode"
   set_fact:
     _sys_svc_rdbms_central_db_enabled: >-
-      {{ lookup('database', _database_consumer_id, 'shared') | bool }}
+      {{ (groups[lookup('database', _database_consumer_id, 'id')] | default([])) | length > 0 }}
   changed_when: false
 
 - name: "For '{{ application_id }}/{{ _database_consumer_id }}': Apply dedicated database setup"
@@ -52,4 +52,6 @@
     database_name: "{{ lookup('database', _database_consumer_id, 'name') }}"
     database_username: "{{ lookup('database', _database_consumer_id, 'username') }}"
     database_password: "{{ lookup('database', _database_consumer_id, 'password') }}"
-  when: _sys_svc_rdbms_central_db_enabled | bool
+  when:
+    - _sys_svc_rdbms_central_db_enabled | bool
+    - inventory_hostname in (groups[lookup('database', _database_consumer_id, 'id')] | default([]))
diff --git a/tasks/utils/load_app.yml b/tasks/utils/load_app.yml
index 09e4bff4cf..3b62859409 100644
--- a/tasks/utils/load_app.yml
+++ b/tasks/utils/load_app.yml
@@ -13,3 +13,5 @@
   vars:
     application_id: "{{ load_app_id }}"
     domain: "{{ lookup('domain', load_app_id) }}"
+  when:
+    - groups[load_app_id] is not defined or inventory_hostname in groups[load_app_id]