diff --git a/charts/kiali/templates/kiali.yaml b/charts/kiali/templates/kiali.yaml
deleted file mode 100644
index 541fb62..0000000
--- a/charts/kiali/templates/kiali.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
----
-apiVersion: kiali.io/v1alpha1
-kind: Kiali
-metadata:
-  name: {{ include "kiali.fullname" . }}
-  labels:
-    {{- include "kiali.labels" . | nindent 4 }}
-spec:
-  image_version: "operator_version"
-  istio_namespace: {{ .Values.istioNamespace | quote }}
-  deployment:
-    accessible_namespaces: "**"
-    image_name: {{ .Values.image_name | quote }}
-    # image_version: {{ .Values.image_version | quote }}
-  external_services:
-    grafana:
-      auth:
-        type: "basic"
-        username: {{ .Values.grafanaUserName  | quote }}
-        password: "secret:{{ .Values.grafanaSecretName }}:{{ .Values.grafanaSecretPasswordKey }}"
-      in_cluster_url: {{ .Values.grafanaInClusterUrl | quote}}
-      url: {{ .Values.grafanaPublicUrl | quote }}
-    prometheus:
-      url: {{ .Values.prometheusInClusterUrl | quote }}
-    tracing:
-      in_cluster_url: {{ .Values.jaegerInClusterUrl | quote }}
-  auth:
-    strategy: {{ .Values.kialiAuthStrategy }}
-{{ if eq .Values.kialiAuthStrategy "openid" }}
-    openid:
-      client_id: {{ .Values.openid.clientId | quote }}
-      disable_rbac: {{ .Values.openid.disableRbac }}
-      issuer_uri: {{ .Values.openid.issuerUri | quote }}
-      username_claim: {{ .Values.openid.username_claim | quote }}
-{{- end }}
diff --git a/charts/kiali/templates/secret.yaml b/charts/kiali/templates/secret.yaml
deleted file mode 100644
index d7a530e..0000000
--- a/charts/kiali/templates/secret.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-{{ if .Values.openid.secret }}
-apiVersion: v1
-kind: Secret
-metadata:
-  name: kiali-o
-  labels:
-    {{- include "kiali.labels" . | nindent 4 }}
-stringData:
-  oidc-secret: {{ .Values.openid.secret | quote }}
-{{- end }}
diff --git a/charts/kiali/values.yaml b/charts/kiali/values.yaml
deleted file mode 100644
index 888c110..0000000
--- a/charts/kiali/values.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-publicHostname: "kiali"
-publicDomain: "cluster.domain"
-
-istioNamespace: "istio-system"
-prometheusInClusterUrl: "http://loki-prometheus-server.prometheus.svc.cluster.local/"
-jaegerInClusterUrl: "http://istio-jaeger-query.istio-tools.svc.cluster.local:16686/"
-grafanaInClusterUrl: "http://loki-grafana.grafana.svc.cluster.local/"
-grafanaPublicUrl: "https://grafana.cluster.domain/"
-# grafanaUserName: "admin"
-grafanaUserName: "YWRtaW4="
-grafanaSecretName: "kiali"
-grafanaSecretPasswordKey: "grafana_password"
-
-kialiAuthStrategy: openid
-openid:
-  clientId: "sso_admin_client_id"
-  secret: "sso_admin_client_secret"
-  disableRbac: true
-  issuerUri: "https://keycloak.cluster.domain/realms/sso_admin_realm"
-  usernameClaim: "username_claim"
diff --git a/copy_images.tf b/copy_images.tf
index 418ba95..96cc219 100644
--- a/copy_images.tf
+++ b/copy_images.tf
@@ -1,6 +1,6 @@
 locals {
-  kiali_operator_key = format("%v#%v", "istio-tools/kiali-operator", var.kiali_application_version)
-  # kiali_key          = format("%v#%v", "istio-tools/kiali", var.kiali_application_version)
+  kiali_operator_key     = format("%v#%v", "istio-tools/kiali-operator", var.kiali_application_version)
+  kiali_server_key       = format("%v#%v", "istio-tools/kiali", var.kiali_application_version)
 
   image_config = [
     ## Images for Kiali
diff --git a/charts/kiali/.helmignore b/kiali-server/.helmignore
similarity index 100%
rename from charts/kiali/.helmignore
rename to kiali-server/.helmignore
diff --git a/charts/kiali/Chart.yaml b/kiali-server/Chart.yaml
similarity index 98%
rename from charts/kiali/Chart.yaml
rename to kiali-server/Chart.yaml
index f5b6dc8..742901b 100644
--- a/charts/kiali/Chart.yaml
+++ b/kiali-server/Chart.yaml
@@ -1,6 +1,6 @@
 ---
 apiVersion: v2
-name: kiali
+name: kiali-server
 description: A Helm chart for Kubernetes
 
 # A chart can be either an 'application' or a 'library' chart.
diff --git a/kiali-server/templates/NOTES.txt b/kiali-server/templates/NOTES.txt
new file mode 100644
index 0000000..c3b3453
--- /dev/null
+++ b/kiali-server/templates/NOTES.txt
@@ -0,0 +1,2 @@
+1. Get the application URL by running these commands:
+
diff --git a/charts/kiali/templates/_helpers.tpl b/kiali-server/templates/_helpers.tpl
similarity index 73%
rename from charts/kiali/templates/_helpers.tpl
rename to kiali-server/templates/_helpers.tpl
index 25040c8..21d38a9 100644
--- a/charts/kiali/templates/_helpers.tpl
+++ b/kiali-server/templates/_helpers.tpl
@@ -2,7 +2,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "kiali.name" -}}
+{{- define "kiali-server.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
@@ -11,7 +11,7 @@ Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 If release name contains chart name it will be used as a full name.
 */}}
-{{- define "kiali.fullname" -}}
+{{- define "kiali-server.fullname" -}}
 {{- if .Values.fullnameOverride }}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
 {{- else }}
@@ -27,16 +27,16 @@ If release name contains chart name it will be used as a full name.
 {{/*
 Create chart name and version as used by the chart label.
 */}}
-{{- define "kiali.chart" -}}
+{{- define "kiali-server.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
 {{/*
 Common labels
 */}}
-{{- define "kiali.labels" -}}
-helm.sh/chart: {{ include "kiali.chart" . }}
-{{ include "kiali.selectorLabels" . }}
+{{- define "kiali-server.labels" -}}
+helm.sh/chart: {{ include "kiali-server.chart" . }}
+{{ include "kiali-server.selectorLabels" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
@@ -46,17 +46,17 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{/*
 Selector labels
 */}}
-{{- define "kiali.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "kiali.name" . }}
+{{- define "kiali-server.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "kiali-server.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
 {{/*
 Create the name of the service account to use
 */}}
-{{- define "kiali.serviceAccountName" -}}
+{{- define "kiali-server.serviceAccountName" -}}
 {{- if .Values.serviceAccount.create }}
-{{- default (include "kiali.fullname" .) .Values.serviceAccount.name }}
+{{- default (include "kiali-server.fullname" .) .Values.serviceAccount.name }}
 {{- else }}
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}
diff --git a/kiali-server/templates/kiali.yaml b/kiali-server/templates/kiali.yaml
new file mode 100644
index 0000000..47f8cd1
--- /dev/null
+++ b/kiali-server/templates/kiali.yaml
@@ -0,0 +1,36 @@
+apiVersion: kiali.io/v1alpha1
+kind: Kiali
+metadata:
+  name: {{ include "kiali.fullname" . }}
+  labels:
+    {{- include "kiali.labels" . | nindent 4 }}
+spec:
+  istio_namespace: {{ .Values.istioNamespace }}
+  auth:
+    strategy: "token"
+  deployment:
+    cluster_wide_access: true
+    view_only_mode: false
+  external_services:
+    prometheus:
+      enabled: true
+      auth:
+        insecure_skip_verify: true
+      url: {{ .Values.prometheus.url }}
+    grafana:
+      enabled: true
+      auth:
+        type: basic
+        username: "admin"
+        password: secret:{{ .Values.grafana.secretName }}:{{ .Values.grafana.passwordKey }}
+      external_url: {{ .Values.grafana.externalUrl }}
+      internal_url: {{ .Values.grafana.internalUrl }}
+    tracing:
+      enabled: true
+      internal_url: {{ .Values.tracing.internalUrl }}
+      use_grpc: false
+      provider: "tempo"
+      tempo_config:
+        org_id: "1"
+        datasource_uid: "fedkp0zap3uv4d"
+        url_format: "grafana"
diff --git a/kiali-server/values.yaml b/kiali-server/values.yaml
new file mode 100644
index 0000000..b7d9356
--- /dev/null
+++ b/kiali-server/values.yaml
@@ -0,0 +1,29 @@
+# Default values for kiali-server.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+istioNamespace: "istio-system"
+
+prometheus:
+  enabled: true
+  url:
+
+grafana:
+  enabled: true
+  auth:
+    type: basic
+    username: "admin"
+    secretName: 
+    passwordKey: 
+  externalUrl: 
+  internalUrl: 
+
+tracing:
+  enabled: true
+  internalUrl: 
+  use_grpc: false
+  provider: "tempo"
+  tempo_config:
+    org_id: "1"
+    datasource_uid: 
+    url_format: "grafana"
diff --git a/main.tf b/main.tf
index f78cbc1..b02d609 100644
--- a/main.tf
+++ b/main.tf
@@ -1,10 +1,12 @@
-
 locals {
 
   internal_hostname    = format("kiali.%v.svc.cluster.local", var.namespace)
   internal_port_number = "20001"
   internal_url         = format("http://%v:%v/", local.internal_hostname, local.internal_port_number)
 
+  grafana_secret_name  = "kiali"
+  grafana_password_key = "grafana_password"
+
   preinstall_script = <<CONFIG
 wait_for_istio_ready() {
   local retries http_code
@@ -19,44 +21,16 @@ wait_for_istio_ready() {
   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)"
+ensure_secret ${local.grafana_secret_name} ${local.grafana_password_key} "$(kubectl -n ${var.grafana_namespace} get secret ${var.grafana_secret_name} -o jsonpath='{.data.admin-password}' | base64 -d)"
 CONFIG
-
-  public_hostname    = format("kiali.%v", var.cluster_domain)
-  public_port_number = "80"
-  public_url         = format("https://%v:%v/", local.public_hostname, local.public_port_number)
-  ns                 = try(kubernetes_namespace.ns[0].metadata[0].name, data.kubernetes_namespace.operators[0].metadata[0].name)
-}
-
-data "kubernetes_namespace" "operators" {
-  metadata {
-    name = var.operators_namespace
-  }
-}
-
-resource "kubernetes_namespace" "ns" {
-  metadata {
-    name = var.namespace
-    labels = {
-      istio-injection = "enabled"
-    }
-  }
 }
 
-# data "kubernetes_namespace" "keycloak" {
-#   count = local.have_keycloak ? 1 : 0
-
-#   metadata {
-#     name = var.keycloak_namespace
-#   }
-# }
-
 module "service_account" {
   # tflint-ignore: terraform_module_pinned_source
   source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-config-job.git//service-account"
 
-  namespace            = local.ns
-  read_only_namespaces = ["grafana"]
+  namespace            = var.namespace
+  read_only_namespaces = [var.grafana_namespace]
 }
 
 module "preinstall" {
@@ -64,7 +38,7 @@ module "preinstall" {
 
   profile              = var.profile
   cluster_name         = var.cluster_name
-  namespace            = local.ns
+  namespace            = var.namespace
   service_account_name = module.service_account.service_account_name
   job_name             = "istio-tools-config-job"
   config_script        = local.preinstall_script
@@ -75,7 +49,7 @@ resource "helm_release" "kiali_operator" {
   chart      = "kiali-operator"
   version    = var.kiali_operator_version
   name       = "kiali-operator"
-  namespace  = data.kubernetes_namespace.operators.metadata[0].name
+  namespace  = var.namespace
   repository = "https://kiali.org/helm-charts"
 
   set {
@@ -89,6 +63,8 @@ resource "helm_release" "kiali_operator" {
     name  = "image.tag"
     value = module.images.images[local.kiali_operator_key].tag
   }
+  
+
   set {
     name  = "cr.create"
     value = "false"
@@ -98,135 +74,73 @@ resource "helm_release" "kiali_operator" {
     value = var.namespace
   }
   set {
-    name  = "allowAdHocKialiImage"
-    value = true
+    name  = "env[0].name"
+    value = "RELATED_IMAGE_kiali_default"
+  }
+  set {
+    name  = "env[0].value"
+    value = format("%v/%v:%v",
+      module.images.images[local.kiali_server_key].dest_registry,
+      module.images.images[local.kiali_server_key].dest_repository,
+      module.images.images[local.kiali_server_key].tag
+    )
   }
 }
 
 resource "helm_release" "kiali" {
   depends_on = [
-    helm_release.kiali-operator,
-    # module.preinstall,
+    helm_release.kiali_operator,
+    module.preinstall,
   ]
 
-  chart      = "kiali"
+  chart      = "./kiali-server"
   name       = "kiali"
-  namespace  = local.ns
-  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
-  }
+  namespace  = var.namespace
 
-  set {
-    name  = "publicHostname"
-    value = var.public_hostname
-  }
-  set {
-    name  = "publicDomain"
-    value = var.cluster_domain
-  }
   set {
     name  = "istioNamespace"
     value = var.istio_namespace
   }
   set {
-    name  = "prometheusInClusterUrl"
+    name  = "prometheus.url"
     value = var.prometheus_internal_url
   }
   set {
-    name  = "jaegerInClusterUrl"
-    value = var.jaeger_internal_url
+    name  = "grafana.secretName"
+    value = local.grafana_secret_name
   }
   set {
-    name  = "grafanaInClusterUrl"
-    value = var.grafana_internal_url
+    name  = "grafana.passwordKey"
+    value = local.grafana_password_key
   }
   set {
-    name  = "grafanaPublicUrl"
+    name  = "grafana.externalUrl"
     value = var.grafana_public_url
   }
   set {
-    name  = "grafanaUserName"
-    value = "YWRtaW4="
-    # value = "admin"
+    name  = "grafana.internalUrl"
+    value = var.grafana_internal_url
   }
   set {
-    name  = "grafanaSecretName"
-    value = "kiali"
+    name  = "tracing.internalUrl"
+    value = var.tempo_internal_url
   }
   set {
-    name  = "grafanaPasswordKey"
-    value = "grafana_password"
+    name  = "tracing.tempo_config.datasource_uid"
+    value = var.tempo_datasource_id
   }
+
+  
 }
 
-#  dynamic "set" {
-#    for_each = local.have_keycloak ? ["openid"] : ["anonymous"]
-#    content {
-#      name  = "kialiAuthStrategy"
-#      value = set.value
-#    }
-#  }
-#  dynamic "set" {
-#    for_each = local.have_keycloak ? [var.sso_client_id] : []
-#    content {
-#      name  = "openid.clientId"
-#      value = set.value
-#    }
-#  }
-#  dynamic "set" {
-#    for_each = local.have_keycloak ? [var.sso_client_secret] : []
-#    content {
-#      name  = "openid.secret"
-#      value = set.value
-#    }
-#  }
-#  dynamic "set" {
-#    for_each = local.have_keycloak ? [local.keycloak_issuer_uri] : []
-#    content {
-#      name  = "openid.issuerUri"
-#      value = set.value
-#    }
-#  }
-#  dynamic "set" {
-#    for_each = local.have_keycloak ? ["username_claim"] : []
-#    content {
-#      name  = "openid.username_claim"
-#      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 "ingress_resources" {
+  # tflint-ignore: terraform_module_version
+  # tflint-ignore: terraform_module_pinned_source
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-istio-service-ingress.git?ref=main"
+
+  public_hostname = "kiali"
+  public_domain = format("%v.%v", var.cluster_name, var.cluster_domain)
+  service_name = "kiali"
+  service_namespace = var.namespace
+  service_port = local.internal_port_number
+}
diff --git a/outputs.tf b/outputs.tf
index 8664c39..d3b64bb 100644
--- a/outputs.tf
+++ b/outputs.tf
@@ -1,11 +1,7 @@
 
 output "public_endpoint" {
   description = "The public endpoint to use to access kiali"
-  value = {
-    hostname    = local.public_hostname
-    port_number = local.public_port_number
-    url         = local.public_url
-  }
+  value = module.ingress_resources.service_url
 }
 
 output "internal_endpoint" {
diff --git a/variables.tf b/variables.tf
index a50098b..e019c65 100644
--- a/variables.tf
+++ b/variables.tf
@@ -20,23 +20,12 @@ variable "namespace" {
   default     = "istio-tools"
 }
 
-# variable "create_namespace" {
-#   description = "Indicates whether the `namespace` needs to be created ('true') or already exists (not `true`)"
-#   type        = bool
-#   default     = true
-# }
-
 variable "istio_namespace" {
   description = "The namespace where istio has been deployed."
   type        = string
   default     = "istio-system"
 }
 
-variable "operators_namespace" {
-  description = "The namespace into which all operators are to be deployed."
-  type        = string
-}
-
 variable "grafana_namespace" {
   description = "The namespace holding the grafana instance, used to look up the grafana password."
   type        = string
@@ -62,8 +51,13 @@ variable "prometheus_internal_url" {
   type        = string
 }
 
-variable "jaeger_internal_url" {
-  description = "The url within the cluster to use to query the jaegertracing."
+variable "tempo_internal_url" {
+  description = "The url within the cluster to use to query tempo tracing."
+  type        = string
+}
+
+variable "tempo_datasource_id" {
+  description = "The UID of the created Tempo datasource"
   type        = string
 }
 
@@ -73,8 +67,6 @@ variable "public_hostname" {
   default     = "kiali"
 }
 
-
-
 # helm repo add kiali https://kiali.org/helm-charts
 # helm search repo kiali/kiali-operator
 variable "kiali_operator_version" {