diff --git a/roles/drawio/README.md b/roles/drawio/README.md
deleted file mode 100644
index 225dd44..0000000
--- a/roles/drawio/README.md
+++ /dev/null
@@ -1,38 +0,0 @@
-Role Name
-=========
-
-A brief description of the role goes here.
-
-Requirements
-------------
-
-Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required.
-
-Role Variables
---------------
-
-A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well.
-
-Dependencies
-------------
-
-A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles.
-
-Example Playbook
-----------------
-
-Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too:
-
-    - hosts: servers
-      roles:
-         - { role: username.rolename, x: 42 }
-
-License
--------
-
-BSD
-
-Author Information
-------------------
-
-An optional section for the role authors to include contact information, or a website (HTML is not allowed).
diff --git a/roles/drawio/defaults/main.yml b/roles/drawio/defaults/main.yml
deleted file mode 100644
index 7b67976..0000000
--- a/roles/drawio/defaults/main.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-#SPDX-License-Identifier: MIT-0
----
-# defaults file for drawio
-
-# Base directory configuration (inherited from base role or defined here)
-docker_compose_base_dir: /etc/docker/compose
-
-# Drawio-specific configuration
-drawio_service_name: drawio
-drawio_docker_compose_dir: "{{ docker_compose_base_dir }}/{{ drawio_service_name }}"
-
-# Service configuration
-drawio_domain: "drawio.local.test"
-drawio_image: "jgraph/drawio:latest"
-drawio_port: 8080
-drawio_extra_hosts: []
-
-# Traefik configuration
-drawio_traefik_network: "proxy"
-drawio_use_ssl: true
\ No newline at end of file
diff --git a/roles/drawio/handlers/main.yml b/roles/drawio/handlers/main.yml
deleted file mode 100644
index f1ef0da..0000000
--- a/roles/drawio/handlers/main.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-#SPDX-License-Identifier: MIT-0
----
-# handlers file for drawio
-
-- name: restart drawio
-  community.docker.docker_compose_v2:
-    project_src: "{{ drawio_docker_compose_dir }}"
-    state: restarted
\ No newline at end of file
diff --git a/roles/drawio/meta/main.yml b/roles/drawio/meta/main.yml
deleted file mode 100644
index 6f91fd3..0000000
--- a/roles/drawio/meta/main.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-#SPDX-License-Identifier: MIT-0
-galaxy_info:
-  author: your name
-  description: your role description
-  company: your company (optional)
-
-  # If the issue tracker for your role is not on github, uncomment the
-  # next line and provide a value
-  # issue_tracker_url: http://example.com/issue/tracker
-
-  # Choose a valid license ID from https://spdx.org - some suggested licenses:
-  # - BSD-3-Clause (default)
-  # - MIT
-  # - GPL-2.0-or-later
-  # - GPL-3.0-only
-  # - Apache-2.0
-  # - CC-BY-4.0
-  license: license (GPL-2.0-or-later, MIT, etc)
-
-  min_ansible_version: 2.2
-
-  # If this a Container Enabled role, provide the minimum Ansible Container version.
-  # min_ansible_container_version:
-
-  galaxy_tags: []
-    # List tags for your role here, one per line. A tag is a keyword that describes
-    # and categorizes the role. Users find roles by searching for tags. Be sure to
-    # remove the '[]' above, if you add tags to this list.
-    #
-    # NOTE: A tag is limited to a single word comprised of alphanumeric characters.
-    #       Maximum 20 tags per role.
-
-dependencies: []
-  # List your role dependencies here, one per line. Be sure to remove the '[]' above,
-  # if you add dependencies to this list.
diff --git a/roles/drawio/tasks/main.yml b/roles/drawio/tasks/main.yml
deleted file mode 100644
index 67bd50d..0000000
--- a/roles/drawio/tasks/main.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-#SPDX-License-Identifier: MIT-0
----
-# tasks file for drawio
-
-- name: Create docker compose directory
-  file:
-    path: "{{ drawio_docker_compose_dir }}"
-    state: directory
-    mode: '0755'
-
-- name: Create docker-compose file for drawio
-  template:
-    src: docker-compose.yml.j2
-    dest: "{{ drawio_docker_compose_dir }}/docker-compose.yml"
-    mode: '0644'
-  notify: restart drawio
-
-- name: Start drawio container
-  community.docker.docker_compose_v2:
-    project_src: "{{ drawio_docker_compose_dir }}"
-    state: present
\ No newline at end of file
diff --git a/roles/drawio/templates/docker-compose.yml.j2 b/roles/drawio/templates/docker-compose.yml.j2
deleted file mode 100644
index b6b9ef5..0000000
--- a/roles/drawio/templates/docker-compose.yml.j2
+++ /dev/null
@@ -1,28 +0,0 @@
-services:
-  drawio:
-    image: {{ drawio_image }}
-    container_name: {{ drawio_service_name }}
-    restart: unless-stopped
-    networks:
-      - {{ drawio_traefik_network }}
-{% if drawio_extra_hosts is defined and drawio_extra_hosts | length > 0 %}
-    extra_hosts:
-{% for host in drawio_extra_hosts %}
-      - "{{ host }}"
-{% endfor %}
-{% endif %}
-    labels:
-      - traefik.enable=true
-      - traefik.docker.network={{ drawio_traefik_network }}
-      - traefik.http.routers.{{ drawio_service_name }}.rule=Host(`{{ drawio_domain }}`)
-      - traefik.http.services.{{ drawio_service_name }}.loadbalancer.server.port={{ drawio_port }}
-{% if drawio_use_ssl %}
-      - traefik.http.routers.{{ drawio_service_name }}.entrypoints=websecure
-      - traefik.http.routers.{{ drawio_service_name }}.tls=true
-{% else %}
-      - traefik.http.routers.{{ drawio_service_name }}.entrypoints=web
-{% endif %}
-
-networks:
-  {{ drawio_traefik_network }}:
-    external: true
\ No newline at end of file
diff --git a/roles/drawio/tests/inventory b/roles/drawio/tests/inventory
deleted file mode 100644
index 03ca42f..0000000
--- a/roles/drawio/tests/inventory
+++ /dev/null
@@ -1,3 +0,0 @@
-#SPDX-License-Identifier: MIT-0
-localhost
-
diff --git a/roles/drawio/tests/test.yml b/roles/drawio/tests/test.yml
deleted file mode 100644
index b542b76..0000000
--- a/roles/drawio/tests/test.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-#SPDX-License-Identifier: MIT-0
----
-- hosts: localhost
-  remote_user: root
-  roles:
-    - drawio
diff --git a/roles/drawio/vars/main.yml b/roles/drawio/vars/main.yml
deleted file mode 100644
index 245172f..0000000
--- a/roles/drawio/vars/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-#SPDX-License-Identifier: MIT-0
----
-# vars file for drawio
diff --git a/roles/nextcloud/defaults/main.yml b/roles/nextcloud/defaults/main.yml
index ddafddf..e40ea55 100644
--- a/roles/nextcloud/defaults/main.yml
+++ b/roles/nextcloud/defaults/main.yml
@@ -29,12 +29,6 @@ nextcloud_enable_collabora: true
 nextcloud_collabora_domain: "office.local.test"
 nextcloud_collabora_disable_cert_verification: false
 
-# Draw.io integration (set nextcloud_drawio_url to enable)
-nextcloud_enable_drawio: false
-nextcloud_drawio_url: ""
-nextcloud_drawio_theme: "kennedy"
-nextcloud_drawio_offline: "yes"
-
 nextcloud_use_s3_storage: false
 nextcloud_s3_key: changeme
 nextcloud_s3_secret: changeme
diff --git a/roles/nextcloud/tasks/drawio.yml b/roles/nextcloud/tasks/drawio.yml
deleted file mode 100644
index bd2e17e..0000000
--- a/roles/nextcloud/tasks/drawio.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-#SPDX-License-Identifier: MIT-0
----
-# tasks file for configuring draw.io in Nextcloud
-
-- name: Configure draw.io URL
-  community.docker.docker_container_exec:
-    container: "{{ nextcloud_docker_compose_dir | basename }}-nextcloud-1"
-    command: php /var/www/html/occ config:app:set drawio DrawioUrl --value={{ nextcloud_drawio_url }}
-  when: nextcloud_drawio_url | length > 0
-
-- name: Configure draw.io theme
-  community.docker.docker_container_exec:
-    container: "{{ nextcloud_docker_compose_dir | basename }}-nextcloud-1"
-    command: php /var/www/html/occ config:app:set drawio DrawioTheme --value={{ nextcloud_drawio_theme }}
-
-- name: Configure draw.io offline mode
-  community.docker.docker_container_exec:
-    container: "{{ nextcloud_docker_compose_dir | basename }}-nextcloud-1"
-    command: php /var/www/html/occ config:app:set drawio DrawioOffline --value={{ nextcloud_drawio_offline }}
\ No newline at end of file
diff --git a/roles/nextcloud/tasks/main.yml b/roles/nextcloud/tasks/main.yml
index c849b17..71f68c5 100644
--- a/roles/nextcloud/tasks/main.yml
+++ b/roles/nextcloud/tasks/main.yml
@@ -70,10 +70,6 @@
   ansible.builtin.include_tasks: collabora.yml
   when: nextcloud_enable_collabora
 
-- name: Configure nextcloud draw.io
-  ansible.builtin.include_tasks: drawio.yml
-  when: nextcloud_enable_drawio
-
 - name: Configure LDAP backend
   ansible.builtin.include_tasks: ldap.yml
   when: nextcloud_ldap_enabled
diff --git a/roles/opencloud/defaults/main.yml b/roles/opencloud/defaults/main.yml
index a939618..d7abfee 100644
--- a/roles/opencloud/defaults/main.yml
+++ b/roles/opencloud/defaults/main.yml
@@ -64,11 +64,5 @@ opencloud_ldap_group_schema_groupname: "cn"
 opencloud_ldap_group_schema_member: "member"
 opencloud_ldap_write_enabled: false
 
-# Draw.io integration (set opencloud_drawio_url to enable)
-opencloud_drawio_url: ""
-opencloud_drawio_theme: "minimal"
-opencloud_drawio_extension_image: "opencloudeu/web-extensions:draw-io-latest"
-
-# CSP configuration (extra URLs to allow in connect-src and frame-src)
-opencloud_csp_extra_connect_src: []
-opencloud_csp_extra_frame_src: []
\ No newline at end of file
+# CSP configuration (extra URLs to allow in connect-src)
+opencloud_csp_extra_connect_src: []
\ No newline at end of file
diff --git a/roles/opencloud/tasks/main.yml b/roles/opencloud/tasks/main.yml
index e448bb9..d3ce5ba 100644
--- a/roles/opencloud/tasks/main.yml
+++ b/roles/opencloud/tasks/main.yml
@@ -31,32 +31,7 @@
     owner: "1000"
     group: "1000"
     mode: '0644'
-  when: opencloud_csp_extra_connect_src | length > 0 or opencloud_csp_extra_frame_src | length > 0
-  notify: restart opencloud
-
-- name: Create draw.io extension apps directory
-  file:
-    path: "{{ opencloud_docker_volume_dir }}/data/web/assets/apps/draw-io"
-    state: directory
-    owner: "1000"
-    group: "1000"
-    mode: '0755'
-  when: opencloud_drawio_url | length > 0
-
-- name: Create draw.io extension config
-  copy:
-    content: |
-      {
-        "config": {
-          "url": "{{ opencloud_drawio_url }}",
-          "theme": "{{ opencloud_drawio_theme }}"
-        }
-      }
-    dest: "{{ opencloud_docker_volume_dir }}/data/web/assets/apps/draw-io/config.json"
-    owner: "1000"
-    group: "1000"
-    mode: '0644'
-  when: opencloud_drawio_url | length > 0
+  when: opencloud_csp_extra_connect_src | length > 0
   notify: restart opencloud
 
 - name: Create docker-compose file for opencloud
diff --git a/roles/opencloud/templates/csp-override.yaml.j2 b/roles/opencloud/templates/csp-override.yaml.j2
index 29afd38..f71cd9b 100644
--- a/roles/opencloud/templates/csp-override.yaml.j2
+++ b/roles/opencloud/templates/csp-override.yaml.j2
@@ -7,13 +7,6 @@ directives:
 {% for url in opencloud_csp_extra_connect_src %}
     - "{{ url }}"
 {% endfor %}
-{% if opencloud_csp_extra_frame_src | length > 0 %}
-  frame-src:
-    - "'self'"
-{% for url in opencloud_csp_extra_frame_src %}
-    - "{{ url }}"
-{% endfor %}
-{% endif %}
   script-src:
     - "'self'"
     - "'unsafe-inline'"
diff --git a/roles/opencloud/templates/docker-compose.yml.j2 b/roles/opencloud/templates/docker-compose.yml.j2
index eca62b3..88faa46 100644
--- a/roles/opencloud/templates/docker-compose.yml.j2
+++ b/roles/opencloud/templates/docker-compose.yml.j2
@@ -1,21 +1,8 @@
 services:
-{% if opencloud_drawio_url %}
-  drawio-ext:
-    image: {{ opencloud_drawio_extension_image }}
-    entrypoint: /bin/sh
-    command: ["-c", "cp -R /usr/share/nginx/html/apps/draw-io/ /apps/"]
-    volumes:
-      - {{ opencloud_docker_volume_dir }}/data/web/assets/apps:/apps
-{% endif %}
   opencloud:
     image: {{ opencloud_image }}
     container_name: {{ opencloud_service_name }}
     restart: unless-stopped
-{% if opencloud_drawio_url %}
-    depends_on:
-      drawio-ext:
-        condition: service_completed_successfully
-{% endif %}
     entrypoint:
       - /bin/sh
     command: ["-c", "opencloud init || true; opencloud server"]
@@ -31,7 +18,7 @@ services:
       OC_INSECURE: "true"
       OC_LOG_LEVEL: "{{ opencloud_log_level }}"
       PROXY_TLS: "false"
-{% if opencloud_csp_extra_connect_src | length > 0 or opencloud_csp_extra_frame_src | length > 0 %}
+{% if opencloud_csp_extra_connect_src | length > 0 %}
       PROXY_CSP_CONFIG_FILE_OVERRIDE_LOCATION: "/etc/opencloud/csp-override.yaml"
 {% endif %}
       IDM_ADMIN_PASSWORD: "{{ opencloud_admin_password }}"