diff --git a/group_vars/all/07_applications.yml b/group_vars/all/07_applications.yml
index e038f68a..f57ce0b9 100644
--- a/group_vars/all/07_applications.yml
+++ b/group_vars/all/07_applications.yml
@@ -66,6 +66,13 @@ defaults_applications:
     matomo_tracking_enabled:      "{{matomo_tracking_enabled_default}}"     # Enables\Disables Matomo Tracking
     css_enabled:                  "{{css_enabled_default}}"                 # Enables\Disables Global CSS Style
     landingpage_iframe_enabled:   "{{landingpage_iframe_enabled_default}}"  # Enables\Disables the possibility to embed this on landing page via iframe
+    credentials:
+#      shared_secret:                                                       # Needs to be defined in inventory file
+#      etherpad_api_key:                                                    # Needs to be defined in inventory file                                             
+#      rails_secret:                                                        # Needs to be defined in inventory file
+#      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  
 
   ## Bluesky
   bluesky:
@@ -197,7 +204,7 @@ defaults_applications:
     import_realm:       True                                                # If True realm will be imported. If false skip.
     database: 
       central_storage:  True                                                # Activate Central Database Storage
-#   database_password:                                                      # Needs to be defined in inventory file   
+#   database_password:                                                      # Needs to be defined in inventory file
 #   administrator_password:                                                 # Needs to be defined in inventory file
     matomo_tracking_enabled:      "{{matomo_tracking_enabled_default}}"     # Enables\Disables Matomo Tracking
     css_enabled:                  "{{css_enabled_default}}"                 # Enables\Disables Global CSS Style
diff --git a/roles/docker-bigbluebutton/templates/env.j2 b/roles/docker-bigbluebutton/templates/env.j2
index 73f484a2..d77bcbcb 100644
--- a/roles/docker-bigbluebutton/templates/env.j2
+++ b/roles/docker-bigbluebutton/templates/env.j2
@@ -28,11 +28,11 @@ RECORDING_MAX_AGE_DAYS=365
 # SECRETS
 # ====================================
 # important! change these to any random values
-SHARED_SECRET={{bigbluebutton_shared_secret}}
-ETHERPAD_API_KEY={{bigbluebutton_etherpad_api_key}}
-RAILS_SECRET={{bigbluebutton_rails_secret}}
-POSTGRESQL_SECRET={{bigbluebutton_postgresql_secret}}
-FSESL_PASSWORD={{bigbluebutton_fsesl_password}}
+SHARED_SECRET={{applications.bigbluebutton.shared_secret}}
+ETHERPAD_API_KEY={{applications.bigbluebutton.etherpad_api_key}}
+RAILS_SECRET={{applications.bigbluebutton.rails_secret}}
+POSTGRESQL_SECRET={{applications.bigbluebutton.postgresql_secret}}
+FSESL_PASSWORD={{applications.bigbluebutton.fsesl_password}}
 
 
 
@@ -54,7 +54,7 @@ STUN_PORT={{ ports.public.stun[application_id] }}
 # TURN SERVER
 # uncomment and adjust following two lines to add an external TURN server
 TURN_SERVER=turns:{{domains[application_id]}}:{{ ports.public.turn[application_id] }}?transport=tcp
-TURN_SECRET={{bigbluebutton_turn_secret}}
+TURN_SECRET={{applications.bigbluebutton.turn_secret}}
 
 # Allowed SIP IPs
 # due to high traffic caused by bots, by default the SIP port is blocked.
diff --git a/roles/docker-bigbluebutton/vars/main.yml b/roles/docker-bigbluebutton/vars/main.yml
index f6d0f512..d3cb860d 100644
--- a/roles/docker-bigbluebutton/vars/main.yml
+++ b/roles/docker-bigbluebutton/vars/main.yml
@@ -5,7 +5,7 @@ docker_compose_file_final:    "{{ docker_compose.directories.instance }}docker-c
 database_instance:            "bigbluebutton"
 database_name:                "greenlight-v3"
 database_username:            "postgres"
-database_password:            "{{bigbluebutton_postgresql_secret}}"
+database_password:            "{{applications.bigbluebutton.postgresql_secret}}"
 domain: 	                    "{{ domains[application_id] }}"
 http_port: 	                  "{{ ports.localhost.http[application_id] }}"
 bbb_env_file_link:            "{{ docker_compose.directories.instance }}.env"