diff --git a/public/v4/apps/keycloak.yml b/public/v4/apps/keycloak.yml
index 30d2741..18a0921 100644
--- a/public/v4/apps/keycloak.yml
+++ b/public/v4/apps/keycloak.yml
@@ -35,19 +35,20 @@ services:
                 - ENV KC_DB_URL=jdbc:postgresql://srv-captain--$$cap_appname-db/keycloak
                 - ENV KC_DB_USERNAME=keycloak
                 - ENV KC_DB_PASSWORD=$$cap_pg_pass
-                - ENTRYPOINT ["/opt/keycloak/bin/kc.sh", "start", "--optimized --hostname=$$cap_appname.$$cap_root_domain", "--proxy=edge"]
+                - ENV KC_HOSTNAME=$$cap_appname.$$cap_root_domain
+                - ENTRYPOINT ["/opt/keycloak/bin/kc.sh", "start", "--optimized", "--proxy=edge"]
 
 caproverOneClickApp:
     variables:
         - id: $$cap_postgres_version
           label: Postgres Version
-          defaultValue: '10.21'
-          description: Check out their DB page for any valid major tested https://www.keycloak.org/server/db
+          defaultValue: '15'
+          description: Check out Keycloak DB page for any valid major tested https://www.keycloak.org/server/db
           validRegex: /^([^\s^\/])+$/
         - id: $$cap_keycloak_version
           label: Keycloak Version
-          defaultValue: 20.0.3
-          description: v20.0.3 current as of 2023-01-13.  Check out their Docker page for the valid tags https://quay.io/repository/keycloak/keycloak?tab=tags
+          defaultValue: '23.0.1'
+          description: v23.0.1 current as of 2023-12-06.  Check out Keycloak Docker page for the valid tags https://quay.io/repository/keycloak/keycloak?tab=tags
           validRegex: /^([^\s^\/])+$/
         - id: $$cap_pg_pass
           label: Postgres Password
@@ -57,6 +58,7 @@ caproverOneClickApp:
         - id: $$cap_keycloak_admin
           label: Keycloak admin user
           description: 'Login username for the admin web user.'
+          defaultValue: 'admin'
           validRegex: /.{1,}/
         - id: $$cap_keycloak_password
           label: Keycloak admin password
@@ -85,7 +87,7 @@ caproverOneClickApp:
 
 
             IMPORTANT: It will take up to 1 minutes for Keycloak to be ready. Before that, you might see 502 error page.
-    displayName: 'Keycloack'
+    displayName: 'Keycloak'
     isOfficial: true
     description: Keycloak is an open source identity and access management solution
     documentation: Taken from https://github.com/keycloak/keycloak-containers/blob/main/docker-compose-examples/keycloak-postgres.yml