diff --git a/group_vars/all/07_applications.yml b/group_vars/all/07_applications.yml
index f57ce0b9..0f96e4bf 100644
--- a/group_vars/all/07_applications.yml
+++ b/group_vars/all/07_applications.yml
@@ -73,7 +73,8 @@ defaults_applications:
 #      postgresql_secret:                                                   # Needs to be defined in inventory file   
 #      fsesl_password:                                                      # Needs to be defined in inventory file
 #      turn_secret:                                                         # Needs to be defined in inventory file  
-
+    urls:
+      api:                        "https://{{domain.bigbluebutton}}/bigbluebutton/"
   ## Bluesky
   bluesky:
     users:
diff --git a/roles/docker-bigbluebutton/Setup.md b/roles/docker-bigbluebutton/Setup.md
new file mode 100644
index 00000000..32b4ab7b
--- /dev/null
+++ b/roles/docker-bigbluebutton/Setup.md
@@ -0,0 +1,6 @@
+# Setup
+
+## Passwords
+```bash
+docker run --rm ruby:latest ruby -rsecurerandom -e 'puts SecureRandom.hex(64)'
+```
\ No newline at end of file
diff --git a/roles/docker-bigbluebutton/tasks/main.yml b/roles/docker-bigbluebutton/tasks/main.yml
index 9fc81837..f44f5070 100644
--- a/roles/docker-bigbluebutton/tasks/main.yml
+++ b/roles/docker-bigbluebutton/tasks/main.yml
@@ -33,6 +33,14 @@
     dest: "{{ bbb_env_file_origine }}"
   notify: setup bigbluebutton
 
+- name: "Update healthcheck for bbb-graphql-server"
+  # This is neccessary because the healthcheck doesn't listen to the correct port
+  lineinfile: 
+    line: "    healthcheck:\n      test: [\"CMD\", \"curl\", \"-f\", \"http://localhost:8085/healthz\"]\n      interval: 30s\n      timeout: 10s\n      retries: 5\n      start_period: 10s"
+    path: "{{docker_compose_file_final}}"
+    insertafter: "bbb-graphql-server:"
+  listen: setup bigbluebutton
+
 - name: Create symbolic link from .env file to target location
   ansible.builtin.file:
     src:    "{{ bbb_env_file_origine }}"
diff --git a/roles/docker-nextcloud/vars/plugins/bbb.yml b/roles/docker-nextcloud/vars/plugins/bbb.yml
new file mode 100644
index 00000000..5847d1b4
--- /dev/null
+++ b/roles/docker-nextcloud/vars/plugins/bbb.yml
@@ -0,0 +1,7 @@
+plugin_configuration:
+  - appid:        "bbb"
+    configkey:    "api.secret"
+    configvalue:  "{{ applications.bigbluebutton.credentials.shared_secret }}"
+  - appid:        "bbb"
+    configkey:    "api.url"
+    configvalue:  "{{ applications.bigbluebutton.urls.api }}"
diff --git a/roles/gcc/meta/main.yml b/roles/gcc/meta/main.yml
index b6b23565..01707fc4 100644
--- a/roles/gcc/meta/main.yml
+++ b/roles/gcc/meta/main.yml
@@ -1,7 +1,7 @@
 ---
 galaxy_info:
   author: "Kevin Veen-Birkenbach"
-  description: "Installs the GNU Compiler Collection (GCC)"
+  description: "Installs the GNU Compiler Collection (GCC)."
   license: "CyMaIS NonCommercial License (CNCL)"
   license_url: "https://s.veen.world/cncl"
   company: |