diff --git a/group_vars/all b/group_vars/all
index 8e82414c..fe669388 100644
--- a/group_vars/all
+++ b/group_vars/all
@@ -243,7 +243,8 @@ joomla_version:                   "latest"
 
 #### Keycloak
 keycloak_version:                 "latest"
-keycloak_administrator_username:  "{{administrator_username}}"
+keycloak_administrator_username:  "{{administrator_username}}"  # Administrator Username for Keycloak
+keycloak_oidc_active:             true                          # Implement OpenID Connect https://en.wikipedia.org/wiki/OpenID_Connect
 
 #### LDAP
 ldap_lam_version:                     "latest"
diff --git a/roles/docker-bigbluebutton/templates/env.j2 b/roles/docker-bigbluebutton/templates/env.j2
index e66cee50..5c57a622 100644
--- a/roles/docker-bigbluebutton/templates/env.j2
+++ b/roles/docker-bigbluebutton/templates/env.j2
@@ -281,6 +281,7 @@ HELP_URL=https://docs.bigbluebutton.org/greenlight/gl-overview.html
 #   approval - For approve/decline registration
 DEFAULT_REGISTRATION=invite
 
+{% if keycloak_oidc_active | bool %}
 ### EXTERNAL AUTHENTICATION METHODS
 # @See https://docs.bigbluebutton.org/greenlight/v3/external-authentication/
 #
@@ -288,3 +289,4 @@ OPENID_CONNECT_CLIENT_ID={{oauth2_proxy_client_id}}
 OPENID_CONNECT_CLIENT_SECRET={{oauth2_proxy_client_secret}}
 OPENID_CONNECT_ISSUER={{oauth2_proxy_oidc_issuer_url}}
 OPENID_CONNECT_REDIRECT=https://{{domain}}
+{% endif %}
\ No newline at end of file