diff --git a/roles/docker-nextcloud/tasks/config.yml b/roles/docker-nextcloud/tasks/config.yml
new file mode 100644
index 00000000..5bc5afdc
--- /dev/null
+++ b/roles/docker-nextcloud/tasks/config.yml
@@ -0,0 +1,18 @@
+- name: Merge all files in cymais directory (container)
+  block:
+    - name: Add dynamic config merging from Jinja template
+      template:
+        src: include.php.j2
+        dest: "{{nextcloud_host_include_instructions_file}}"
+      notify: docker compose restart
+
+    - name: Copy include instructions to the container
+      command: >
+        docker cp {{ nextcloud_host_include_instructions_file }} {{ applications.nextcloud.container.application }}:{{nextcloud_docker_include_instructions_file}}
+
+    - name: Append generated config to config.php only if not present
+      command: >
+        docker exec -u {{nextcloud_docker_user}} {{ applications.nextcloud.container.application }} sh -c "
+          grep -q '{{ nextcloud_docker_config_additives_directory }}' {{ nextcloud_docker_config_file }} || 
+          cat {{nextcloud_docker_include_instructions_file}} >> {{ nextcloud_docker_config_file }}"
+      notify: docker compose restart
\ No newline at end of file
diff --git a/roles/docker-nextcloud/tasks/main.yml b/roles/docker-nextcloud/tasks/main.yml
index 19766d9a..d5302bbd 100644
--- a/roles/docker-nextcloud/tasks/main.yml
+++ b/roles/docker-nextcloud/tasks/main.yml
@@ -41,24 +41,8 @@
 - name: Flush all handlers immediately so that occ can be used
   meta: flush_handlers
 
-- name: Merge all files in cymais directory (container)
-  block:
-    - name: Add dynamic config merging from Jinja template
-      template:
-        src: include.php.j2
-        dest: "{{nextcloud_host_include_instructions_file}}"
-      notify: docker compose restart
-
-    - name: Copy include instructions to the container
-      command: >
-        docker cp {{ nextcloud_host_include_instructions_file }} {{ applications.nextcloud.container.application }}:{{nextcloud_docker_include_instructions_file}}
-
-    - name: Append generated config to config.php only if not present
-      command: >
-        docker exec -u {{nextcloud_docker_user}} {{ applications.nextcloud.container.application }} sh -c "
-          grep -q '{{ nextcloud_docker_config_additives_directory }}' {{ nextcloud_docker_config_file }} || 
-          cat {{nextcloud_docker_include_instructions_file}} >> {{ nextcloud_docker_config_file }}"
-      notify: docker compose restart
+- name: Setup config.php 
+  include_tasks: config.yml
 
 - name: Setup Nextcloud Plugins
   include_tasks: plugin.yml
diff --git a/roles/docker-nextcloud/templates/docker-compose.yml.j2 b/roles/docker-nextcloud/templates/docker-compose.yml.j2
index 50fd20ec..08906da1 100644
--- a/roles/docker-nextcloud/templates/docker-compose.yml.j2
+++ b/roles/docker-nextcloud/templates/docker-compose.yml.j2
@@ -9,9 +9,7 @@ services:
     container_name: {{applications.nextcloud.container.application}}
     volumes:
       - data:{{nextcloud_docker_work_directory}}
-{% if applications[application_id].oidc.flavor == "oidc_login" %}
       - {{nextcloud_host_config_additives_directory}}:{{nextcloud_docker_config_additives_directory}}:ro
-{% endif %}
     healthcheck:
       test: ["CMD", "su", "www-data", "-s", "/bin/sh", "-c", "php {{nextcloud_docker_work_directory}}occ status"]
       interval: 1m