diff --git a/README.md b/README.md
index 10616a6..69651cc 100644
--- a/README.md
+++ b/README.md
@@ -89,9 +89,9 @@ 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_keycloak_db_config"></a> [keycloak\_db\_config](#module\_keycloak\_db\_config) | git::https://github.e.it.census.gov/SCT-Engineering/tfmod-config-job.git/ | mcmCluster//config-job |
+| <a name="module_post_install"></a> [post\_install](#module\_post\_install) | git::https://github.e.it.census.gov/SCT-Engineering/tfmod-config-job.git/ | mcmCluster//config-job |
+| <a name="module_pre_install"></a> [pre\_install](#module\_pre\_install) | git::https://github.e.it.census.gov/SCT-Engineering/tfmod-config-job.git/ | mcmCluster//config-job |
 | <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
diff --git a/main.tf b/main.tf
index 1894c1e..225ae2e 100644
--- a/main.tf
+++ b/main.tf
@@ -77,10 +77,10 @@ module "service_account" {
 
 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"
+  source = "git::https://github.e.it.census.gov/SCT-Engineering/tfmod-config-job.git/?ref=mcmCluster//config-job"
   # source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-config-job.git//config-job"
 
-  namespace            = kubernetes_namespace.keycloak.metadata[0].name
+  namespace            = module.service_account.namespace
   service_account_name = module.service_account.service_account_name
   job_name             = "keycloak-config-secret-job"
   config_script        = local.secrets_job_script
@@ -141,10 +141,9 @@ data "kubernetes_secret" "db-secrets" {
 
 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"
-  # source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-config-job.git//config-job"
+  source = "git::https://github.e.it.census.gov/SCT-Engineering/tfmod-config-job.git/?ref=mcmCluster//config-job"
 
-  namespace            = kubernetes_namespace.keycloak.metadata[0].name
+  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
@@ -191,14 +190,14 @@ module "ingress_resources" {
   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"
+  service_name      = format("%v-%v-%v", var.service_name, var.keycloak_namespace, "http")
   service_namespace = var.keycloak_namespace
   service_port      = local.public_port_number
 }
 
 module "post_install" {
   # tflint-ignore: terraform_module_pinned_source
-  source = "git::https://github.e.it.census.gov/SCT-Engineering/tfmod-config-job.git//config-job"
+  source = "git::https://github.e.it.census.gov/SCT-Engineering/tfmod-config-job.git/?ref=mcmCluster//config-job"
   # source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-config-job.git//config-job"
 
   namespace            = helm_release.keycloak.namespace