diff --git a/group_vars/all b/group_vars/all
index d4100217..b850bf91 100644
--- a/group_vars/all
+++ b/group_vars/all
@@ -228,6 +228,9 @@ gitlab_version:                   "latest"
 #### Joomla
 joomla_version:                   "latest"
 
+#### Keycloak
+keycloak_version:                 "latest"
+
 #### Listmonk
 listmonk_admin_username:          "admin"
 listmonk_public_api_activated:    False # Security hole. Can be used for spaming
@@ -257,10 +260,10 @@ mailu_domain:           "{{top_domain}}"
 mailu_subnet:           "192.168.203.0/24"
 
 #### Moodle
-moodle_site_name:       "Global Learning Academy on {{top_domain}}"
-moodle_user_name:       "{{administrator_username}}"
-moodle_user_email:      "{{administrator_email}}"
-moodle_version:         "latest"
+moodle_site_name:           "Global Learning Academy on {{top_domain}}"
+moodle_administrator_name:  "{{administrator_username}}"
+moodle_administrator_email: "{{administrator_email}}"
+moodle_version:             "latest"
 
 #### MyBB
 mybb_version:            "latest"
@@ -283,5 +286,5 @@ postgres_database_version:      "latest"
 taiga_version:          "latest"
 
 #### YOURLS
-yourls_user:            "{{administrator_username}}"
-yourls_version:         "latest"
\ No newline at end of file
+yourls_administrator_name:  "{{administrator_username}}"
+yourls_version:             "latest"
\ No newline at end of file
diff --git a/inventory.example.yml b/inventory.example.yml
index 35766f4c..90ae60ee 100644
--- a/inventory.example.yml
+++ b/inventory.example.yml
@@ -45,7 +45,7 @@ pixelfed_database_password:         "I_NEED_TO_CHANGE_THIS_UNSECURE_PASSWORD"
 pixelfed_app_key:                   "I_NEED_TO_CHANGE_THIS_UNSECURE_PASSWORD"
 wordpress_database_password:        "I_NEED_TO_CHANGE_THIS_UNSECURE_PASSWORD"
 yourls_database_password:           "I_NEED_TO_CHANGE_THIS_UNSECURE_PASSWORD"
-yourls_user_password:               "I_NEED_TO_CHANGE_THIS_UNSECURE_PASSWORD"
+yourls_administrator_name_password:               "I_NEED_TO_CHANGE_THIS_UNSECURE_PASSWORD"
 
 path_mass_storage:                  "/mnt/hdd/"
 path_rapid_storage:                 "/mnt/ssd/"
\ No newline at end of file
diff --git a/roles/docker-keycloak/templates/docker-compose.yml.j2 b/roles/docker-keycloak/templates/docker-compose.yml.j2
index 494c502c..9eb4d546 100644
--- a/roles/docker-keycloak/templates/docker-compose.yml.j2
+++ b/roles/docker-keycloak/templates/docker-compose.yml.j2
@@ -6,24 +6,24 @@ services:
 {% include 'templates/docker/services/' + database_type + '.yml.j2' %}
 
   keycloak:
-    image: quay.io/keycloak/keycloak:latest
+    image: quay.io/keycloak/keycloak:{{keycloak_version}}
     command: start
     environment:
-      KC_HOSTNAME: {{domain}}
-      KC_HOSTNAME_PORT: {{http_port}}
-      KC_HOSTNAME_STRICT_BACKCHANNEL: false
-      KC_HTTP_ENABLED: true
-      KC_HOSTNAME_STRICT_HTTPS: false
-      KC_HEALTH_ENABLED: true
-      KEYCLOAK_ADMIN: ${KEYCLOAK_ADMIN}
-      KEYCLOAK_ADMIN_PASSWORD: ${KEYCLOAK_ADMIN_PASSWORD}
-      KC_DB: postgres
-      KC_DB_URL: jdbc:postgresql://{{database_host}}/{{database_name}}
-      KC_DB_USERNAME: {{database_username}}
-      KC_DB_PASSWORD: {{database_password}}
+      KC_HOSTNAME:                    {{domain}}
+      #KC_HOSTNAME_PORT:               {{http_port}}
+      KC_HOSTNAME_STRICT_BACKCHANNEL: true
+      KC_HTTP_ENABLED:                false
+      KC_HOSTNAME_STRICT_HTTPS:       true
+      KC_HEALTH_ENABLED:              true
+      KEYCLOAK_ADMIN:                 ${KEYCLOAK_ADMIN}
+      KEYCLOAK_ADMIN_PASSWORD:        ${KEYCLOAK_ADMIN_PASSWORD}
+      KC_DB:                          postgres
+      KC_DB_URL:                      jdbc:postgresql://{{database_host}}/{{database_name}}
+      KC_DB_USERNAME:                 {{database_username}}
+      KC_DB_PASSWORD:                 {{database_password}}
     ports:
       - "127.0.0.1:{{http_port}}:8080"
-    restart: always
+    restart: {{docker_restart_policy}}
 {% include 'templates/docker/container/depends-on-just-database.yml.j2' %}
 {% include 'templates/docker/container/networks.yml.j2' %}
 
diff --git a/roles/docker-moodle/templates/docker-compose.yml.j2 b/roles/docker-moodle/templates/docker-compose.yml.j2
index 0444e8f2..d57c9079 100644
--- a/roles/docker-moodle/templates/docker-compose.yml.j2
+++ b/roles/docker-moodle/templates/docker-compose.yml.j2
@@ -18,9 +18,9 @@ services:
       - MOODLE_SITE_NAME="{{moodle_site_name}}"
       - MOODLE_SSLPROXY=yes
       - MOODLE_REVERSE_PROXY=yes
-      - MOODLE_USERNAME={{moodle_user_name}}
+      - MOODLE_USERNAME={{moodle_administrator_name}}
       - MOODLE_PASSWORD={{moodle_user_password}}
-      - MOODLE_EMAIL={{moodle_user_email}}
+      - MOODLE_EMAIL={{moodle_administrator_email}}
       - BITNAMI_DEBUG={% if mode_debug | bool %}true{% else %}false{% endif %} 
     volumes:
       - 'moodle:/bitnami/moodle'
diff --git a/roles/docker-yourls/templates/docker-compose.yml.j2 b/roles/docker-yourls/templates/docker-compose.yml.j2
index db5b665e..386c63bf 100644
--- a/roles/docker-yourls/templates/docker-compose.yml.j2
+++ b/roles/docker-yourls/templates/docker-compose.yml.j2
@@ -15,8 +15,8 @@ services:
       YOURLS_DB_PASS: "{{database_password}}"
       YOURLS_DB_NAME: "{{database_name}}"
       YOURLS_SITE: "https://{{domain}}"
-      YOURLS_USER: "{{yourls_user}}"
-      YOURLS_PASS: "{{yourls_user_password}}"
+      yourls_administrator_name: "{{yourls_administrator_name}}"
+      YOURLS_PASS: "{{yourls_administrator_name_password}}"
     healthcheck:
       test: ["CMD", "curl", "-f", "http://127.0.0.1/admin/"]
       interval: 1m