diff --git a/.cz.yaml b/.cz.yaml
index 012238e..e152a43 100644
--- a/.cz.yaml
+++ b/.cz.yaml
@@ -1,10 +1,11 @@
 ---
 commitizen:
-  name: cz_conventional_commits
-  tag_format: v$version
-  version: 0.1.0
-  version_files:
-    - version.tf:module_version
   bump_message: "bump: version $current_version → $new_version"
   changelog_incremental: true
+  major_version_zero: true
+  name: cz_gitmoji
+  tag_format: $version
   update_changelog_on_bump: true
+  version_files:
+    - version.tf:module_version
+  version_provider: scm
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 7ef969f..eb969a4 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -47,7 +47,7 @@ repos:
 
 # Terraform Hooks
 - repo: https://github.com/antonbabenko/pre-commit-terraform
-  rev: v1.98.0 # Get the latest from: https://github.com/antonbabenko/pre-commit-terraform/releases
+  rev: v1.99.0 # Get the latest from: https://github.com/antonbabenko/pre-commit-terraform/releases
   hooks:
     - id: terraform_fmt
       args:
diff --git a/README.md b/README.md
index a133e48..a366d18 100644
--- a/README.md
+++ b/README.md
@@ -76,8 +76,8 @@ Common issues and solutions:
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.95.0 |
-| <a name="provider_aws.eecr"></a> [aws.eecr](#provider\_aws.eecr) | 5.95.0 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.96.0 |
+| <a name="provider_aws.eecr"></a> [aws.eecr](#provider\_aws.eecr) | 5.96.0 |
 | <a name="provider_helm"></a> [helm](#provider\_helm) | 2.17.0 |
 | <a name="provider_kubernetes"></a> [kubernetes](#provider\_kubernetes) | 2.36.0 |
 | <a name="provider_null"></a> [null](#provider\_null) | 3.2.4 |
@@ -89,9 +89,7 @@ Common issues and solutions:
 |------|--------|---------|
 | <a name="module_images"></a> [images](#module\_images) | git::https://github.e.it.census.gov/terraform-modules/aws-ecr-copy-images.git/ | tf-upgrade |
 | <a name="module_ingress_resources"></a> [ingress\_resources](#module\_ingress\_resources) | git::https://github.e.it.census.gov/SCT-Engineering/tfmod-istio-service-ingress.git | n/a |
-| <a name="module_keycloak_db_config"></a> [keycloak\_db\_config](#module\_keycloak\_db\_config) | git::https://github.e.it.census.gov/SCT-Engineering/tfmod-config-job.git//config-job | n/a |
 | <a name="module_post_install"></a> [post\_install](#module\_post\_install) | git::https://github.e.it.census.gov/SCT-Engineering/tfmod-config-job.git//config-job | n/a |
-| <a name="module_pre_install"></a> [pre\_install](#module\_pre\_install) | git::https://github.e.it.census.gov/SCT-Engineering/tfmod-config-job.git//config-job | n/a |
 | <a name="module_service_account"></a> [service\_account](#module\_service\_account) | git::https://github.e.it.census.gov/SCT-Engineering/tfmod-config-job.git//service-account | n/a |
 
 ## Resources
@@ -101,11 +99,12 @@ Common issues and solutions:
 | [helm_release.keycloak](https://registry.terraform.io/providers/hashicorp/helm/latest/docs/resources/release) | resource |
 | [helm_release.keycloak-db](https://registry.terraform.io/providers/hashicorp/helm/latest/docs/resources/release) | resource |
 | [kubernetes_namespace.keycloak](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/namespace) | resource |
+| [kubernetes_secret.keycloak_secrets](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/secret) | resource |
 | [null_resource.git_version](https://registry.terraform.io/providers/hashicorp/null/latest/docs/resources/resource) | resource |
+| [random_password.passwords](https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/password) | resource |
 | [random_uuid.user_secret](https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/uuid) | resource |
 | [aws_ecr_authorization_token.ecr_token](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/ecr_authorization_token) | data source |
 | [aws_ecr_authorization_token.token](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/ecr_authorization_token) | data source |
-| [kubernetes_secret.db-secrets](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/data-sources/secret) | data source |
 
 ## Inputs
 
@@ -118,10 +117,9 @@ Common issues and solutions:
 | <a name="input_default_realm"></a> [default\_realm](#input\_default\_realm) | The default realm to use to configure the environment. | `string` | `"cluster-user"` | no |
 | <a name="input_eecr_info"></a> [eecr\_info](#input\_eecr\_info) | Enterprise ECR source information | <pre>object({<br/>    account_id = string<br/>    alias      = string<br/>    profile    = string<br/>    region     = string<br/>  })</pre> | <pre>{<br/>  "account_id": "269222635945",<br/>  "alias": "lab-gov-shared-nonprod",<br/>  "profile": "269222635945-lab-gov-shared-nonprod",<br/>  "region": "us-gov-east-1"<br/>}</pre> | no |
 | <a name="input_keycloak_chart_version"></a> [keycloak\_chart\_version](#input\_keycloak\_chart\_version) | The version of the helm chart to install | `string` | `"7.0.1"` | no |
-| <a name="input_keycloak_hostname"></a> [keycloak\_hostname](#input\_keycloak\_hostname) | The hostname used to access the keycloak service. | `string` | `"keycloak"` | no |
-| <a name="input_keycloak_namespace"></a> [keycloak\_namespace](#input\_keycloak\_namespace) | The namespace which will be created and into which keycloak will be deployed. | `string` | `"keycloak"` | no |
 | <a name="input_keycloak_tag"></a> [keycloak\_tag](#input\_keycloak\_tag) | The image tag associated with the keycloak\_chart\_version | `string` | `"26.0.7"` | no |
 | <a name="input_keycloak_user"></a> [keycloak\_user](#input\_keycloak\_user) | The username for the database. | `string` | `"keycloak"` | no |
+| <a name="input_namespace"></a> [namespace](#input\_namespace) | The namespace which will be created and into which keycloak will be deployed. | `string` | `"keycloak"` | no |
 | <a name="input_postgres_exporter_tag"></a> [postgres\_exporter\_tag](#input\_postgres\_exporter\_tag) | The tag of the postgres exporter image to use. | `string` | `"17.4.0"` | no |
 | <a name="input_postgresql_chart_version"></a> [postgresql\_chart\_version](#input\_postgresql\_chart\_version) | The helm chart version of postgresql to use. | `string` | `"17.4.0"` | no |
 | <a name="input_postgresql_tag"></a> [postgresql\_tag](#input\_postgresql\_tag) | The tag of the postgresql image to use. | `string` | `"17.4.0"` | no |
diff --git a/charts/keycloakx/examples/postgresql/keycloak-server-values.yaml b/charts/keycloakx/examples/postgresql/keycloak-server-values.yaml
index 3b03e6a..98f9f1f 100644
--- a/charts/keycloakx/examples/postgresql/keycloak-server-values.yaml
+++ b/charts/keycloakx/examples/postgresql/keycloak-server-values.yaml
@@ -33,8 +33,10 @@ database:
   vendor: postgres
   hostname: keycloak-db-postgresql
   port: 5432
-  username: dbusername
-  password: dbpassword
+  username: keycloak
+  password: keycloak
+  existingSecret: ${secret_name}
+  existingSecretKey: ${database_password_key}
   database: keycloak
 
 secrets:
diff --git a/config_job.tf b/config_job.tf
new file mode 100644
index 0000000..2b5d677
--- /dev/null
+++ b/config_job.tf
@@ -0,0 +1,23 @@
+locals {
+  config_job_script = <<CONFIG
+rootUrl=""
+redirectUrl="https://*"
+login && \
+create_realm ${var.default_realm} && \
+create_admin_user ${var.default_realm} \
+	"$(kc_user)" "$(kc_passwd)" "${var.admin_email}" && \
+create_realm_role ${var.default_realm} admin \
+	"Admin role for ${var.default_realm}" && \
+create_realm_role ${var.default_realm} user \
+	"User role for ${var.default_realm}" && \
+add_realm_role_to_user ${var.default_realm} user user && \
+create_client "${var.default_realm}" "${local.user_client_id}" \
+	"${random_uuid.user_secret.result}" "$rootUrl" "" \
+	"[ \"$redirectUrl\" ]" "" 1 && \
+add_mapper_to_client "${var.default_realm}" \
+	"$(get_client_id "${var.default_realm}" "${local.user_client_id}")" \
+	"realm roles" "openid-connect" "oidc-usermodel-realm-role-mapper" \
+	"{ \"multivalued\": \"true\", \"userinfo.token.claim\": \"true\", \"user.attribute\": \"foo\", \"id.token.claim\": \"true\", \"access.token.claim\": \"true\", \"claim.name\": \"realm_access.roles\", \"jsonType.label\": \"String\" }" && \
+restart_server
+CONFIG
+}
diff --git a/keycloak-db-values.yaml b/keycloak-db-values.yaml
index 2aa7507..59f270e 100644
--- a/keycloak-db-values.yaml
+++ b/keycloak-db-values.yaml
@@ -3,17 +3,25 @@ global:
   security:
     allowInsecureImages: true
   postgresql:
-    architecture: replication
     auth:
-      database: keycloak
-      existingSecret: keycloak-db-creds
+      postgresPassword: ${postgres_password_key}
+      username: ${database_user}
+      database: ${database_name}
+      existingSecret: ${secret_name}
       secretKeys:
-        adminPasswordKey: password
-        userPasswordKey: postgres-password
-        replicationPasswordKey: replication-password
+        adminPasswordKey: ${postgres_password_key}
+        replicationPasswordKey: ${replication_password_key}
+        userPasswordKey: ${database_password_key}
+
+architecture: standalone
+
+replication:
+  applicationName: ${database_name}
 
 image:
-  registry:
+  registry: ${image_registry}
+  repository: ${image_repository}
+  tag: ${image_tag}
 
 volumePermissions:
   image:
@@ -23,7 +31,9 @@ volumePermissions:
 metrics:
   enabled: true
   image:
-    registry:
+    registry: ${metrics_registry}
+    repository: ${metrics_repository}
+    tag: ${metrics_tag}
 
 primary:
   resources:
diff --git a/keycloak-server-values.yaml b/keycloak-server-values.yaml
index 3614a0c..1fe17a9 100644
--- a/keycloak-server-values.yaml
+++ b/keycloak-server-values.yaml
@@ -1,9 +1,15 @@
 # See https://www.keycloak.org/server/configuration
 # See https://www.keycloak.org/server/all-config
 
-replicas: 3
+image:
+  repository: "${image_registry}/${image_repository}"
+  tag: "${image_tag}"
 
 skipInitContainers: true
+autoscaling:
+  enabled: ${autoscaling}
+  minReplicas: 1
+  maxReplicas: 1
 
 command:
   - "/opt/keycloak/bin/kc.sh"
@@ -20,12 +26,12 @@ extraEnv: |
   - name: KC_BOOTSTRAP_ADMIN_USERNAME
     valueFrom:
       secretKeyRef:
-        name: keycloak-user-creds
+        name: ${keycloak_user_creds}
         key: username
   - name: KC_BOOTSTRAP_ADMIN_PASSWORD
     valueFrom:
       secretKeyRef:
-        name: keycloak-user-creds
+        name: ${keycloak_user_creds}
         key: password
   - name: JAVA_OPTS_APPEND
     value: >-
@@ -34,8 +40,12 @@ extraEnv: |
       -Djava.awt.headless=true
       -Djgroups.dns.query={{ include "keycloak.fullname" . }}-headless
 
-# dbchecker:
-#   enabled: true
+# Requires utilities
+dbchecker:
+  enabled: true
+  image:
+    repository: ${db_checker_image_repo}
+    tag: ${db_checker_tag}
 resources:
   requests:
     cpu: 500m
@@ -48,11 +58,17 @@ database:
   vendor: postgres
   hostname: ${database_hostname}
   port: 5432
-  username: ${database_username}
-  # password: dbpassword
-  existingSecret: keycloak-db-creds
-  existingSecretKey: password
   database: ${database_name}
+  existingSecret: ${secret_name}
+  secretKeys:
+    adminPasswordKey: ${database_password_key}
+    userPasswordKey: ${postgres_password_key}
+    replicationPasswordKey: ${replication_password_key}
+  # username: keycloak
+  # password: keycloak
+  # password: dbpassword
+  # existingSecret: ${secret_name}
+  # existingSecretKey: ${database_password_key}
 
 http:
   relativePath: "/"
diff --git a/main.tf b/main.tf
index 56c4fae..7858abc 100644
--- a/main.tf
+++ b/main.tf
@@ -1,66 +1,68 @@
-# main.tf
-resource "random_uuid" "user_secret" {}
-
 locals {
-  public_port_number = "80"
-
   admin_internal_port_number = "9000"
+  public_port_number         = "80"
+  user_client_id             = "sso.user"
+  user_secret                = "user-sso"
+  k8s_secrets = {
+    "keycloak-db-creds" = {
+      data = {
+        username               = "keycloak"
+        password               = random_password.passwords["db"].result
+        "postgres-password"    = random_password.passwords["postgres"].result
+        "replication-password" = random_password.passwords["replication"].result
+      }
+    },
+    "keycloak-user-creds" = {
+      data = {
+        username = "user"
+        password = random_password.passwords["keycloak"].result
+      }
+    },
+    (local.user_secret) = {
+      data = {
+        client_id     = local.user_client_id
+        client_secret = random_uuid.user_secret.result
+      }
+    }
+  }
+  required_passwords = {
+    db = {
+      description = "Database user password"
+      length      = 32
+    },
+    postgres = {
+      description = "Postgres admin password"
+      length      = 32
+    },
+    replication = {
+      description = "Database replication password"
+      length      = 32
+    },
+    keycloak = {
+      description = "Keycloak user password"
+      length      = 24
+    }
+  }
 
-  user_client_id = "sso.user"
-  user_secret    = "user-sso"
-
-  secrets_job_script = <<SECRETS
-ensure_secret keycloak-db-creds username keycloak
-ensure_secret keycloak-db-creds password $(mkpasswd 32 false)
-ensure_secret keycloak-db-creds postgres-password $(mkpasswd 32 false)
-ensure_secret keycloak-db-creds replication-password $(mkpasswd 32 false)
-ensure_secret keycloak-user-creds username user
-ensure_secret keycloak-user-creds password $(mkpasswd 32 false)
-ensure_secret ${local.user_secret} client_id "${local.user_client_id}"
-ensure_secret ${local.user_secret} client_secret "${random_uuid.user_secret.result}"
-SECRETS
-
-  config_job_script = <<CONFIG
-rootUrl=""
-redirectUrl="https://*"
-login && \
-create_realm ${var.default_realm} && \
-create_admin_user ${var.default_realm} \
-	"$(kc_user)" "$(kc_passwd)" "${var.admin_email}" && \
-create_realm_role ${var.default_realm} admin \
-	"Admin role for ${var.default_realm}" && \
-create_realm_role ${var.default_realm} user \
-	"User role for ${var.default_realm}" && \
-add_realm_role_to_user ${var.default_realm} user user && \
-create_client "${var.default_realm}" "${local.user_client_id}" \
-	"${random_uuid.user_secret.result}" "$rootUrl" "" \
-	"[ \"$redirectUrl\" ]" "" 1 && \
-add_mapper_to_client "${var.default_realm}" \
-	"$(get_client_id "${var.default_realm}" "${local.user_client_id}")" \
-	"realm roles" "openid-connect" "oidc-usermodel-realm-role-mapper" \
-	"{ \"multivalued\": \"true\", \"userinfo.token.claim\": \"true\", \"user.attribute\": \"foo\", \"id.token.claim\": \"true\", \"access.token.claim\": \"true\", \"claim.name\": \"realm_access.roles\", \"jsonType.label\": \"String\" }" && \
-restart_server
-CONFIG
-
-  db_config_job_script = <<CONFIG
-echo "Starting DB Config Job"
-cat > /tmp/db_config.sql <<EOF
-CREATE ROLE keycloak LOGIN PASSWORD '${data.kubernetes_secret.db-secrets.data.password}';
-ALTER DATABASE keycloak OWNER TO keycloak;
-COMMIT;
-EOF
-do_kubectl_cp /tmp/db_config.sql keycloak-db-postgresql-0 /tmp/db_config.sql
-do_kubectl exec -n keycloak -t keycloak-db-postgresql-0 -c postgresql -- \
-  /opt/bitnami/postgresql/bin/psql \
-  postgresql://postgres:${data.kubernetes_secret.db-secrets.data.password}@keycloak-db-postgresql.${var.keycloak_namespace}.svc.cluster.local:5432/keycloak \
-  -f /tmp/db_config.sql
-echo "End DB Config Job"
-CONFIG
 }
 
+resource "random_password" "passwords" {
+  for_each = local.required_passwords
+
+  length           = each.value.length
+  special          = true
+  override_special = "!#$%&*-_=+[]<>:?"
+  min_lower        = 2
+  min_upper        = 2
+  min_numeric      = 2
+  min_special      = 2
+}
+
+resource "random_uuid" "user_secret" {}
+
 resource "kubernetes_namespace" "keycloak" {
   metadata {
-    name = var.keycloak_namespace
+    name = var.namespace
     labels = {
       istio-injection = "enabled"
     }
@@ -74,16 +76,19 @@ module "service_account" {
   namespace = kubernetes_namespace.keycloak.metadata[0].name
 }
 
-module "pre_install" {
-  # tflint-ignore: terraform_module_pinned_source
-  source = "git::https://github.e.it.census.gov/SCT-Engineering/tfmod-config-job.git//config-job"
+resource "kubernetes_secret" "keycloak_secrets" {
+  for_each = local.k8s_secrets
 
-  namespace            = kubernetes_namespace.keycloak.metadata[0].name
-  service_account_name = module.service_account.service_account_name
-  job_name             = "keycloak-config-secret-job"
-  config_script        = local.secrets_job_script
-  utilities_image_path = module.images.images[local.utilities_key].dest_full_path
-  timeout              = "5m"
+  metadata {
+    name      = each.key
+    namespace = kubernetes_namespace.keycloak.metadata[0].name
+    labels = {
+      "app.kubernetes.io/managed-by" = "terraform"
+      "app.kubernetes.io/part-of"    = "keycloak"
+    }
+  }
+
+  data = each.value.data
 }
 
 resource "helm_release" "keycloak-db" {
@@ -92,65 +97,37 @@ resource "helm_release" "keycloak-db" {
   name       = "keycloak-db"
   namespace  = kubernetes_namespace.keycloak.metadata[0].name
   repository = "${path.module}/charts"
-  values     = [file("${path.module}/keycloak-db-values.yaml")]
-  wait       = true
-  timeout    = 300
+
+  wait    = true
+  timeout = 600
 
   depends_on = [
-    data.kubernetes_secret.db-secrets,
+    kubernetes_secret.keycloak_secrets["keycloak-db-creds"],
     module.images,
     module.service_account,
-    module.pre_install
   ]
 
-  set {
-    name = "image.repository"
-    value = format("%v/%v",
-      module.images.images[local.postgresql_key].dest_registry,
-      module.images.images[local.postgresql_key].dest_repository
-    )
-  }
-
-  set {
-    name  = "image.tag"
-    value = module.images.images[local.postgresql_key].tag
-  }
-
-  set {
-    name = "metrics.image.repository"
-    value = format("%v/%v",
-      module.images.images[local.postgres_exporter_key].dest_registry,
-      module.images.images[local.postgres_exporter_key].dest_repository
-    )
-  }
-  set {
-    name  = "metrics.image.tag"
-    value = module.images.images[local.postgres_exporter_key].tag
-  }
-}
-
-data "kubernetes_secret" "db-secrets" {
-  depends_on = [module.pre_install]
-  metadata {
-    name      = "keycloak-db-creds"
-    namespace = kubernetes_namespace.keycloak.metadata[0].name
-  }
-}
-
-module "keycloak_db_config" {
-  # tflint-ignore: terraform_module_pinned_source
-  source = "git::https://github.e.it.census.gov/SCT-Engineering/tfmod-config-job.git//config-job"
-
-  namespace            = helm_release.keycloak-db.namespace
-  service_account_name = module.service_account.service_account_name
-  job_name             = "keycloak-db-config-job"
-  config_script        = local.db_config_job_script
-  utilities_image_path = module.images.images[local.utilities_key].dest_full_path
-
-  timeout = "3m"
+  values = [
+    templatefile("${path.module}/keycloak-db-values.yaml", {
+      database_name            = "keycloak"
+      database_password_key    = "password"
+      database_user            = "keycloak"
+      image_registry           = module.images.images[local.postgresql_key].dest_registry
+      image_repository         = module.images.images[local.postgresql_key].dest_repository
+      image_tag                = module.images.images[local.postgresql_key].tag
+      metrics_registry         = module.images.images[local.postgres_exporter_key].dest_registry
+      metrics_repository       = module.images.images[local.postgres_exporter_key].dest_repository
+      metrics_tag              = module.images.images[local.postgres_exporter_key].tag
+      postgres_password_key    = "postgres-password"
+      replication_password_key = "replication-password"
+      secret_name              = kubernetes_secret.keycloak_secrets["keycloak-db-creds"].metadata[0].name
+    })
+  ]
 }
 
 resource "helm_release" "keycloak" {
+  depends_on = [helm_release.keycloak-db]
+
   chart      = "keycloakx"
   name       = "keycloak"
   namespace  = kubernetes_namespace.keycloak.metadata[0].name
@@ -158,37 +135,35 @@ resource "helm_release" "keycloak" {
   repository = "${path.module}/charts"
   timeout    = 600
   wait       = true
-  depends_on = [helm_release.keycloak-db, module.keycloak_db_config]
 
   values = [templatefile("${path.module}/keycloak-server-values.yaml", {
-    hostname = format("https://%v.%v", var.keycloak_hostname, var.cluster_domain)
-
-    database_hostname = "keycloak-db-postgresql"
-    database_name     = "keycloak"
-    database_username = "keycloak"
+    autoscaling              = true
+    database_hostname        = format("%v-%v", helm_release.keycloak-db.name, helm_release.keycloak-db.chart)
+    database_name            = "keycloak"
+    database_password_key    = "password"
+    database_user            = "keycloak"
+    db_checker_image_repo    = format("%v/%v", module.images.images[local.utilities_key].dest_registry, module.images.images[local.utilities_key].dest_repository)
+    db_checker_tag           = module.images.images[local.utilities_key].tag
+    hostname                 = format("https://%v.%v", var.service_name, var.cluster_domain)
+    image_registry           = module.images.images[local.keycloak_key].dest_registry
+    image_repository         = module.images.images[local.keycloak_key].dest_repository
+    image_tag                = module.images.images[local.keycloak_key].tag
+    keycloak_user_creds      = kubernetes_secret.keycloak_secrets["keycloak-user-creds"].metadata[0].name
+    postgres_password_key    = "postgres-password"
+    replication_password_key = "replication-password"
+    secret_name              = kubernetes_secret.keycloak_secrets["keycloak-db-creds"].metadata[0].name
   })]
 
-  set {
-    name = "image.repository"
-    value = format("%v/%v",
-      module.images.images[local.keycloak_key].dest_registry,
-      module.images.images[local.keycloak_key].dest_repository
-    )
-  }
-
-  set {
-    name  = "image.tag"
-    value = var.keycloak_tag
-  }
 }
 
 module "ingress_resources" {
   depends_on = [helm_release.keycloak]
   # tflint-ignore: terraform_module_pinned_source
-  source            = "git::https://github.e.it.census.gov/SCT-Engineering/tfmod-istio-service-ingress.git"
-  public_hostname   = var.service_name
-  public_domain     = var.cluster_domain
-  service_name      = "keycloak-keycloakx-http"
+  source          = "git::https://github.e.it.census.gov/SCT-Engineering/tfmod-istio-service-ingress.git"
+  public_hostname = var.service_name
+  public_domain   = var.cluster_domain
+  service_name    = format("%v-%v-%v", helm_release.keycloak.name, helm_release.keycloak.chart, "http")
+  # service_name      = "keycloak-keycloakx-http"
   service_namespace = kubernetes_namespace.keycloak.metadata[0].name
   service_port      = local.public_port_number
 }
diff --git a/outputs.tf b/outputs.tf
index 1b617ad..d022197 100644
--- a/outputs.tf
+++ b/outputs.tf
@@ -1,9 +1,9 @@
 output "admin_internal_endpoint" {
   description = "internal endpoint for admin"
   value = {
-    hostname    = format("%v.%v.svc.cluster.local", var.service_name, var.keycloak_namespace)
+    hostname    = format("%v.%v.svc.cluster.local", var.service_name, var.namespace)
     port_number = local.admin_internal_port_number
-    url         = format("http://%v.%v.svc.cluster.local:%v", var.service_name, var.keycloak_namespace, local.admin_internal_port_number)
+    url         = format("http://%v.%v.svc.cluster.local:%v", var.service_name, var.namespace, local.admin_internal_port_number)
   }
 }
 
@@ -49,7 +49,7 @@ output "client_secret" {
 
 output "namespace" {
   description = "The namespace in which keycloak gets installed in."
-  value       = var.keycloak_namespace
+  value       = var.namespace
 }
 
 ################################################################################
diff --git a/variables.tf b/variables.tf
index 20ade53..0403679 100644
--- a/variables.tf
+++ b/variables.tf
@@ -49,13 +49,7 @@ variable "keycloak_chart_version" {
   default     = "7.0.1"
 }
 
-variable "keycloak_hostname" {
-  description = "The hostname used to access the keycloak service."
-  type        = string
-  default     = "keycloak"
-}
-
-variable "keycloak_namespace" {
+variable "namespace" {
   description = "The namespace which will be created and into which keycloak will be deployed."
   type        = string
   default     = "keycloak"