diff --git a/chart/kiali/.helmignore b/charts/kiali/.helmignore
similarity index 100%
rename from chart/kiali/.helmignore
rename to charts/kiali/.helmignore
diff --git a/chart/kiali/Chart.yaml b/charts/kiali/Chart.yaml
similarity index 100%
rename from chart/kiali/Chart.yaml
rename to charts/kiali/Chart.yaml
diff --git a/chart/kiali/templates/_helpers.tpl b/charts/kiali/templates/_helpers.tpl
similarity index 100%
rename from chart/kiali/templates/_helpers.tpl
rename to charts/kiali/templates/_helpers.tpl
diff --git a/chart/kiali/templates/kiali.yaml b/charts/kiali/templates/kiali.yaml
similarity index 91%
rename from chart/kiali/templates/kiali.yaml
rename to charts/kiali/templates/kiali.yaml
index 6d4a312..939cafb 100644
--- a/chart/kiali/templates/kiali.yaml
+++ b/charts/kiali/templates/kiali.yaml
@@ -9,6 +9,8 @@ spec:
   istio_namespace: {{ .Values.istioNamespace | quote }}
   deployment:
     accessible_namespaces: "**"
+    image_name: {{ .Values.image_name | quote }}
+    # image_version: {{ .Values.image_version | quote }}
   external_services:
     grafana:
       auth:
diff --git a/chart/kiali/templates/secret.yaml b/charts/kiali/templates/secret.yaml
similarity index 92%
rename from chart/kiali/templates/secret.yaml
rename to charts/kiali/templates/secret.yaml
index 38ec42d..02637db 100644
--- a/chart/kiali/templates/secret.yaml
+++ b/charts/kiali/templates/secret.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: kiali
+  name: kiali-o
   labels:
     {{- include "kiali.labels" . | nindent 4 }}
 stringData:
diff --git a/chart/kiali/values.yaml b/charts/kiali/values.yaml
similarity index 72%
rename from chart/kiali/values.yaml
rename to charts/kiali/values.yaml
index 7c31d29..65aabd5 100644
--- a/chart/kiali/values.yaml
+++ b/charts/kiali/values.yaml
@@ -3,11 +3,12 @@ publicHostname: "kiali"
 publicDomain: "cluster.domain"
 
 istioNamespace: "istio-system"
-prometheusInClusterUrl: "http://loki-prometheus-server.logging.svc.cluster.local/"
+prometheusInClusterUrl: "http://loki-prometheus-server.prometheus.svc.cluster.local/"
 jaegerInClusterUrl: "http://istio-jaeger-query.istio-tools.svc.cluster.local:16686/"
-grafanaInClusterUrl: "http://loki-grafana.logging.svc.cluster.local/"
+grafanaInClusterUrl: "http://loki-grafana.grafana.svc.cluster.local/"
 grafanaPublicUrl: "https://grafana.cluster.domain/"
-grafanaUserName: "admin"
+# grafanaUserName: "admin"
+grafanaUserName: "YWRtaW4="
 grafanaSecretName: "kiali"
 grafanaSecretPasswordKey: "grafana_password"
 
diff --git a/main.tf b/main.tf
index 6ffb7d4..1e1b963 100644
--- a/main.tf
+++ b/main.tf
@@ -27,7 +27,19 @@ locals {
   kiali_oidc_secret = local.have_keycloak ? "ensure_secret kiali oidc-secret \"${var.sso_client_secret}\"" : ";"
 
   preinstall_script = <<CONFIG
-${local.kiali_oidc_secret}
+wait_for_istio_ready() {
+  local retries http_code
+  echo "$(timestamp) : Waiting to make sure istio-proxy is in ready state..."
+  retries=30
+  http_code="$(istio_proxy_health)"
+  while [ "$http_code" != "200" ] && [ $retries -gt 0 ]; do
+    sleep 2
+    retries=$(( retries - 1 ))
+    http_code="$(istio_proxy_health)"
+  done
+  echo "wait_for_istio_ready = $http_code"
+}
+wait_for_istio_ready
 ensure_secret kiali grafana_password "$(kubectl -n ${var.grafana_namespace} get secret ${var.grafana_secret_name} -o jsonpath='{.data.admin-password}' | base64 -d)"
 CONFIG
 }
@@ -71,16 +83,17 @@ data "kubernetes_namespace" "keycloak" {
 }
 
 module "service_account" {
-  #source = "git@github.it.census.gov:SOA/tfmod-config-job.git//service-account?ref=1.0.0"
-  source = "git@github.it.census.gov:SOA/tfmod-config-job.git//service-account"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-config-job.git//service-account"
 
-  namespace = local.ns
+  namespace            = local.ns
+  read_only_namespaces = ["grafana"]
 }
 
 module "preinstall" {
-  #source = "git@github.it.census.gov:SOA/tfmod-config-job.git//config-job?ref=1.0.0"
-  source = "git@github.it.census.gov:SOA/tfmod-config-job.git//config-job"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-config-job.git//config-job?ref=feature-kiali-baseline"
 
+  profile              = var.profile
+  cluster_name         = var.cluster_name
   namespace            = local.ns
   service_account_name = module.service_account.service_account_name
   job_name             = "istio-tools-config-job"
@@ -114,18 +127,35 @@ resource "helm_release" "kiali-operator" {
     name  = "watchNamespace"
     value = local.ns
   }
+  set {
+    name  = "allowAdHocKialiImage"
+    value = true
+  }
 }
 
 resource "helm_release" "kiali" {
   depends_on = [
     helm_release.kiali-operator,
-    module.preinstall,
+    # module.preinstall,
   ]
 
   chart      = "kiali"
   name       = "kiali"
   namespace  = local.ns
-  repository = "${path.module}/charts"
+  repository = "./charts"
+  # repository = "${path.module}/charts"
+
+  set {
+    name  = "image_name"
+    value = format("%v/%v",
+      module.images.images[local.kiali_key].dest_registry,
+      module.images.images[local.kiali_key].dest_repository
+    )
+  }
+  set {
+    name  = "image_version"
+    value = module.images.images[local.kiali_key].tag
+  }
 
   set {
     name  = "publicHostname"
@@ -158,7 +188,8 @@ resource "helm_release" "kiali" {
   }
   set {
     name  = "grafanaUserName"
-    value = "admin"
+    value = "YWRtaW4="
+    # value = "admin"
   }
   set {
     name  = "grafanaSecretName"
@@ -168,6 +199,7 @@ resource "helm_release" "kiali" {
     name  = "grafanaPasswordKey"
     value = "grafana_password"
   }
+}
 
   #  dynamic "set" {
   #    for_each = local.have_keycloak ? ["openid"] : ["anonymous"]
@@ -204,28 +236,28 @@ resource "helm_release" "kiali" {
   #      value = set.value
   #    }
   #  }
-}
 
-module "kiali_ingress" {
-  depends_on = [helm_release.kiali]
-
-  #source = "git@github.it.census.gov:SOA/tfmod-gogatekeeper.git//>ref=1.0.0"
-  source = "git@github.it.census.gov:SOA/tfmod-gogatekeeper.git//"
-
-  certificate_issuer = var.certificate_issuer
-
-  namespace                  = local.ns
-  application_name           = "kiali"
-  public_hostname            = "kiali"
-  cluster_domain             = var.cluster_domain
-  upstream_hostname          = local.internal_hostname
-  upstream_port              = local.internal_port_number
-  redirection_url            = local.public_url
-  client_id                  = var.sso_client_id
-  client_secret              = var.sso_client_secret
-  keycloak_public_url        = var.keycloak_public_url
-  gogatekeeper_chart_version = var.gogatekeeper_chart_version
-  gogatekeeper_registry      = var.gogatekeeper_registry
-  gogatekeeper_repository    = var.gogatekeeper_repository
-  gogatekeeper_tag           = var.gogatekeeper_tag
-}
+
+# module "kiali_ingress" {
+#   depends_on = [helm_release.kiali]
+
+#   #source = "git@github.it.census.gov:SOA/tfmod-gogatekeeper.git//>ref=1.0.0"
+#   source = "git@github.it.census.gov:SOA/tfmod-gogatekeeper.git//"
+
+#   certificate_issuer = var.certificate_issuer
+
+#   namespace                  = local.ns
+#   application_name           = "kiali"
+#   public_hostname            = "kiali"
+#   cluster_domain             = var.cluster_domain
+#   upstream_hostname          = local.internal_hostname
+#   upstream_port              = local.internal_port_number
+#   redirection_url            = local.public_url
+#   client_id                  = var.sso_client_id
+#   client_secret              = var.sso_client_secret
+#   keycloak_public_url        = var.keycloak_public_url
+#   gogatekeeper_chart_version = var.gogatekeeper_chart_version
+#   gogatekeeper_registry      = var.gogatekeeper_registry
+#   gogatekeeper_repository    = var.gogatekeeper_repository
+#   gogatekeeper_tag           = var.gogatekeeper_tag
+# }