diff --git a/.secrets.baseline b/.secrets.baseline
index 6aeee9644..887ef7b0a 100644
--- a/.secrets.baseline
+++ b/.secrets.baseline
@@ -144,7 +144,7 @@
         "filename": "playbooks/acs.yml",
         "hashed_secret": "3a0b8a438a9efa61267357269709a946d797b9bd",
         "is_verified": false,
-        "line_number": 437,
+        "line_number": 431,
         "is_secret": false
       }
     ],
@@ -259,5 +259,5 @@
       }
     ]
   },
-  "generated_at": "2024-09-16T09:39:31Z"
+  "generated_at": "2024-11-12T09:16:56Z"
 }
diff --git a/group_vars/acc.yml b/group_vars/acc.yml
new file mode 100644
index 000000000..7ab201287
--- /dev/null
+++ b/group_vars/acc.yml
@@ -0,0 +1 @@
+acc_app_configuration: {}
diff --git a/group_vars/adw.yml b/group_vars/adw.yml
new file mode 100644
index 000000000..06b8e8408
--- /dev/null
+++ b/group_vars/adw.yml
@@ -0,0 +1,4 @@
+adw_app_configuration:
+  plugins:
+    processService: false
+    microsoftOnline: false
diff --git a/playbooks/acs.yml b/playbooks/acs.yml
index 2e0cb7bc6..9ecfc26e0 100644
--- a/playbooks/acs.yml
+++ b/playbooks/acs.yml
@@ -387,7 +387,6 @@
   gather_facts: false
   vars:
     acs_version_requirement: "{{ acs.version is version('7.4', 'ge') }}"
-    adf_default_configuration: {}
   roles:
     - role: "../roles/adf_app"
       when: acs_version_requirement
@@ -400,7 +399,7 @@
       adf_app_configuration: >-
         {{
           adf_app_oauth_configuration | default({}) |
-          ansible.builtin.combine(adf_default_configuration, recursive=true)
+          ansible.builtin.combine(acc_app_configuration, recursive=true)
         }}
   post_tasks:
     - name: Update installation status file with ACC
@@ -422,11 +421,6 @@
 - name: Alfresco Digital Workspace Role
   hosts: adw
   gather_facts: false
-  vars:
-    adf_default_configuration:
-      plugins:
-        processService: false
-        microsoftOnline: false
   roles:
     - role: "../roles/adf_app"
       when: acs.edition == "Enterprise"
@@ -444,7 +438,7 @@
       adf_app_configuration: >-
         {{
           adf_app_oauth_configuration | default({}) |
-          ansible.builtin.combine(adf_default_configuration, recursive=true)
+          ansible.builtin.combine(adw_app_configuration, recursive=true)
         }}
   post_tasks:
     - name: Update installation status file with ADW