diff --git a/roles/docker-bigbluebutton/handlers/main.yml b/roles/docker-bigbluebutton/handlers/main.yml
index 6f8002f3..e302291a 100644
--- a/roles/docker-bigbluebutton/handlers/main.yml
+++ b/roles/docker-bigbluebutton/handlers/main.yml
@@ -12,22 +12,39 @@
   replace:
     path: "{{docker_compose_file}}"
     regexp: '\./postgres-data:/var/lib/postgresql/data'
-    replace: 'postgres-data:/var/lib/postgresql/data'
+    replace: 'database:/var/lib/postgresql/data'
   listen: setup bigbluebutton
 
 - name: replace greenlight bind mount by volume mount
   replace:
     path: "{{docker_compose_file}}"
     regexp: '\./greenlight-data:/usr/src/app/storage'
-    replace: 'greenlight-data:/usr/src/app/storage'
+    replace: 'greenlight:/usr/src/app/storage'
+  listen: setup bigbluebutton
+
+- name: add volume to redis
+  lineinfile:
+    path: "{{ docker_compose_file }}"
+    insertafter: "^\\s*redis:"
+    line: "    volumes:\n      - redis:/data"
+    firstmatch: yes
+  listen: setup bigbluebutton
+
+- name: add volume to coturn
+  lineinfile:
+    path: "{{ docker_compose_file }}"
+    insertafter: "- ./mod/coturn/turnserver.conf:/etc/coturn/turnserver.conf"
+    line: "      - coturn:/var/lib/coturn"
   listen: setup bigbluebutton
 
 - name: add volumes to docker compose
   blockinfile:
     path: "{{docker_compose_file}}"
     block: |2
-        postgres-data:
-        greenlight-data:
+        database:
+        greenlight:
+        redis:
+        coturn:
     marker: "# {mark} ANSIBLE MANAGED BLOCK FOR VOLUMES"
     insertafter: "html5-static:"
   listen: setup bigbluebutton
diff --git a/roles/docker-bigbluebutton/tasks/main.yml b/roles/docker-bigbluebutton/tasks/main.yml
index 273cea68..f9cc1364 100644
--- a/roles/docker-bigbluebutton/tasks/main.yml
+++ b/roles/docker-bigbluebutton/tasks/main.yml
@@ -50,4 +50,4 @@
 - name: print admin user data
   debug:
     msg: "{{ admin_creation_result.stdout }}"
-  when: admin_creation_result is defined
\ No newline at end of file
+  when: mode_setup | bool
\ No newline at end of file
diff --git a/roles/docker-bigbluebutton/vars/main.yml b/roles/docker-bigbluebutton/vars/main.yml
index 48dbcb08..6fa185cd 100644
--- a/roles/docker-bigbluebutton/vars/main.yml
+++ b/roles/docker-bigbluebutton/vars/main.yml
@@ -1,5 +1,5 @@
 docker_compose_project_name:  "bigbluebutton"
-docker_compose_file:          "{{docker_compose_instance_directory}}/docker-compose.yml"
+docker_compose_file:          "{{docker_compose_instance_directory}}docker-compose.yml"
 database_instance:            "bigbluebutton"
 database_name:                "greenlight-v3"
 database_username:            "postgres"
diff --git a/roles/docker-mariadb/tasks/main.yml b/roles/docker-mariadb/tasks/main.yml
index 5d0cad18..9715a9ad 100644
--- a/roles/docker-mariadb/tasks/main.yml
+++ b/roles/docker-mariadb/tasks/main.yml
@@ -4,11 +4,6 @@
     state: present
   when: run_once_docker_mariadb is not defined
 
-- name: Create a volume for MariaDB socket
-  docker_volume:
-    name: mariadb_socket
-  when: run_once_docker_mariadb is not defined
-
 - name: install MariaDB
   docker_container:
     name: central-mariadb
diff --git a/roles/docker-openproject/tasks/main.yml b/roles/docker-openproject/tasks/main.yml
index c8fbfc8a..2ca735b6 100644
--- a/roles/docker-openproject/tasks/main.yml
+++ b/roles/docker-openproject/tasks/main.yml
@@ -8,6 +8,12 @@
 - name: "include tasks update-repository-with-docker-compose.yml"
   include_tasks: update-repository-with-docker-compose.yml
 
+- name: "create {{dummy_volume}}"
+  file:
+    path: "{{dummy_volume}}"
+    state: directory
+    mode: 0755
+
 - name: "copy .env"
   template: 
     src: env.j2
diff --git a/roles/docker-openproject/templates/docker-compose.yml.j2 b/roles/docker-openproject/templates/docker-compose.yml.j2
index 6f533e66..d6bedb37 100644
--- a/roles/docker-openproject/templates/docker-compose.yml.j2
+++ b/roles/docker-openproject/templates/docker-compose.yml.j2
@@ -17,7 +17,7 @@ x-op-app: &app
     IMAP_ENABLED: "${IMAP_ENABLED:-false}"
   volumes:
     - "data:/var/openproject/assets"
-    # - "database:/var/openproject/pgdata"
+    - "{{dummy_volume}}:/var/openproject/pgdata" # This mount is unnecessary and just done to prevent anonymous volumes
 
 services:
 
@@ -42,7 +42,7 @@ services:
 {% include 'templates/docker-container-networks.yml.j2' %}
     volumes:
       - "data:/var/openproject/assets"
-      # - "database:/var/openproject/pgdata" Should definetly not be necessary here
+      - "{{dummy_volume}}:/var/openproject/pgdata" # This mount is unnecessary and just done to prevent anonymous volumes
 
   web:
     <<: *app
diff --git a/roles/docker-openproject/vars/main.yml b/roles/docker-openproject/vars/main.yml
index aff7ae96..82222267 100644
--- a/roles/docker-openproject/vars/main.yml
+++ b/roles/docker-openproject/vars/main.yml
@@ -5,4 +5,6 @@ docker_compose_file_path:           "{{docker_compose_instance_directory}}docker
 docker_compose_backup_path:         "/tmp/{{docker_compose_project_name}}-docker-compose-backup.yml"
 database_password:                  "{{openproject_database_password}}"
 repository_address:                 "https://github.com/opf/openproject-deploy"
-database_type:                      "postgres"
\ No newline at end of file
+database_type:                      "postgres"
+# The following volume doesn't have a function. It just exist to prevent the creation of unnecessary anonymous volumes
+dummy_volume:                       "{{repository_directory}}dummy_volume"
\ No newline at end of file