diff --git a/chart/templates/NOTES.txt b/chart/templates/NOTES.txt
index 0a49c3f570577bfe8cfff247c5b72eb3fd8dab76..bdeaf3322dc469d032b81817d31fafcd2cb89380 100644
--- a/chart/templates/NOTES.txt
+++ b/chart/templates/NOTES.txt
@@ -149,4 +149,11 @@ PLATFORM ONE MATTERMOST WARNING:
   You have enabled enterprise Mattermost in the values configuration, but not provided a license.
   Make sure to go back and edit your values or ensure you add the license through the mattermost settings page.
 {{- end }}
-{{- end }}
\ No newline at end of file
+{{- end }}
+
+{{- if .Values.hostname }}
+DEPRECATION NOTICE:
+  The top level yaml key "hostname" has been deprecated and replaced with "domain". 
+  Please update your values override to use the "domain" key.
+{{- end }}
+
diff --git a/chart/templates/anchore/values.yaml b/chart/templates/anchore/values.yaml
index e191cf25ef638baac1e7a0adfc0d76bc655d4537..d1f07022a141a6696e0967276329b81c2d584400 100644
--- a/chart/templates/anchore/values.yaml
+++ b/chart/templates/anchore/values.yaml
@@ -3,7 +3,10 @@
 {{- end }}
 
 {{- define "bigbang.defaults.anchore" -}}
-hostname: {{ .Values.hostname }}
+# hostname is deprecated and replaced with domain. But if hostname exists then use it.
+{{- $domainName := default .Values.domain .Values.hostname }}
+hostname: {{ $domainName }}
+domain: {{ $domainName }}
 
 istio:
   enabled: {{ .Values.istio.enabled }}
@@ -33,7 +36,7 @@ enterpriseLicenseYaml: |
 sso:
   enabled: {{ .Values.addons.anchore.sso.enabled }}
   spEntityId: {{ .Values.addons.anchore.sso.client_id }}
-  acsUrl: "https://anchore.{{ .Values.hostname }}/service/sso/auth/keycloak"
+  acsUrl: "https://anchore.{{ $domainName }}/service/sso/auth/keycloak"
   idpMetadataUrl: "https://{{ .Values.sso.oidc.host }}/auth/realms/{{ .Values.sso.oidc.realm }}/protocol/saml/descriptor"
   roleAttribute: {{ .Values.addons.anchore.sso.role_attribute }}
   {{- end }}
diff --git a/chart/templates/argocd/values.yaml b/chart/templates/argocd/values.yaml
index fa9a6fd0e35f7b0b2381d716c96d702b7e8ccdbc..effef976102f28c883657a78bcb264929c397169 100644
--- a/chart/templates/argocd/values.yaml
+++ b/chart/templates/argocd/values.yaml
@@ -3,7 +3,10 @@
 {{- end }}
 
 {{- define "bigbang.defaults.argocd" -}}
-hostname: {{ .Values.hostname }}
+# hostname is deprecated and replaced with domain. But if hostname exists then use it.
+{{- $domainName := default .Values.domain .Values.hostname }}
+hostname: {{ $domainName }}
+domain: {{ $domainName }}
 
 createNamespace: false
 
diff --git a/chart/templates/authservice/values.yaml b/chart/templates/authservice/values.yaml
index 2eb26ecaa9482f015c2084040617267645583c1e..671bdd8b425d6ace28686e51d3aa9c502f8d57c9 100644
--- a/chart/templates/authservice/values.yaml
+++ b/chart/templates/authservice/values.yaml
@@ -3,6 +3,9 @@
 {{- end }}
 
 {{- define "bigbang.defaults.authservice" -}}
+# hostname is deprecated and replaced with domain. But if hostname exists then use it.
+{{- $domainName := default .Values.domain .Values.hostname }}
+
 imagePullSecrets:
   - name: private-registry
 
@@ -61,7 +64,7 @@ chains:
     callback_uri: https://{{ range .Values.jaeger.values.istio.jaeger.hosts }}{{ tpl . $}}{{ end }}/login
     {{- else }}
       prefix: "tracing"
-    callback_uri: https://tracing.{{ .Values.hostname }}/login
+    callback_uri: https://tracing.{{ $domainName }}/login
     {{- end }}
     client_id: "{{ .Values.jaeger.sso.client_id }}"
     client_secret: "{{ .Values.jaeger.sso.client_secret }}"
@@ -79,7 +82,7 @@ chains:
     callback_uri: https://{{ range .Values.monitoring.values.istio.prometheus.hosts }}{{ tpl . $}}{{ end }}/login/generic_oauth
     {{- else }}
       prefix: "prometheus"
-    callback_uri: https://prometheus.{{ .Values.hostname }}/login/generic_oauth
+    callback_uri: https://prometheus.{{ $domainName }}/login/generic_oauth
     {{- end }}
     client_id: {{ .Values.monitoring.sso.prometheus.client_id }}
     client_secret: "{{ .Values.monitoring.sso.prometheus.client_secret }}"
@@ -93,7 +96,7 @@ chains:
     callback_uri: https://{{ range .Values.monitoring.values.istio.alertmanager.hosts }}{{ tpl . $}}{{ end }}/login/generic_oauth
     {{- else }}
       prefix: "alertmanager"
-    callback_uri: https://alertmanager.{{ .Values.hostname }}/login/generic_oauth
+    callback_uri: https://alertmanager.{{ $domainName }}/login/generic_oauth
     {{- end }}
     client_id: {{ .Values.monitoring.sso.alertmanager.client_id }}
     client_secret: "{{ .Values.monitoring.sso.alertmanager.client_secret }}"
diff --git a/chart/templates/gitlab/secret-sso.yaml b/chart/templates/gitlab/secret-sso.yaml
index 324c6ce9a46bfaa4c23c58dccc19a39d67182039..55c41b7269a277b93c58a7625143ac1ff6a5a0ff 100644
--- a/chart/templates/gitlab/secret-sso.yaml
+++ b/chart/templates/gitlab/secret-sso.yaml
@@ -1,5 +1,7 @@
 {{- if or .Values.addons.gitlab.enabled .Values.addons.gitlabRunner.enabled }}
 {{- if .Values.addons.gitlab.sso.enabled }}
+# hostname is deprecated and replaced with domain. But if hostname exists then use it.
+{{- $domainName := default .Values.domain .Values.hostname }}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -24,7 +26,7 @@ stringData:
         "client_options": {
           "identifier": "{{ .Values.addons.gitlab.sso.client_id | default .Values.sso.client_id }}",
           "secret": "{{ .Values.addons.gitlab.sso.client_secret | default .Values.sso.client_secret }}",
-          "redirect_uri": "https://{{ .Values.addons.gitlab.hostnames.gitlab }}.{{ .Values.hostname }}/users/auth/openid_connect/callback",
+          "redirect_uri": "https://{{ .Values.addons.gitlab.hostnames.gitlab }}.{{ $domainName }}/users/auth/openid_connect/callback",
           "end_session_endpoint": "https://{{ .Values.sso.oidc.host }}/auth/realms/{{ .Values.sso.oidc.realm }}/protocol/openid-connect/logout"
         }
       }
diff --git a/chart/templates/gitlab/values.yaml b/chart/templates/gitlab/values.yaml
index 8f1c3836318d99d5e8a609f176cf5eaa2f5f5e9b..fa1a548895950a6727a08ad20d379a1af18d2a71 100644
--- a/chart/templates/gitlab/values.yaml
+++ b/chart/templates/gitlab/values.yaml
@@ -3,7 +3,10 @@
 {{- end }}
 
 {{- define "bigbang.defaults.gitlab" -}}
-hostname: {{ .Values.hostname }}
+# hostname is deprecated and replaced with domain. But if hostname exists then use it.
+{{- $domainName := default .Values.domain .Values.hostname }}
+hostname: {{ $domainName }}
+domain: {{ $domainName }}
 
 openshift: {{ .Values.openshift }}
 
@@ -53,13 +56,13 @@ gitlab:
 
 global:
   hosts:
-    domain: {{ .Values.hostname }}
+    domain: {{ $domainName }}
 
     gitlab:
-      name: {{ .Values.addons.gitlab.hostnames.gitlab }}.{{ .Values.hostname }}
+      name: {{ .Values.addons.gitlab.hostnames.gitlab }}.{{ $domainName }}
 
     registry:
-      name: {{ .Values.addons.gitlab.hostnames.registry }}.{{ .Values.hostname }}
+      name: {{ .Values.addons.gitlab.hostnames.registry }}.{{ $domainName }}
 
   {{- if .Values.addons.gitlab.objectStorage.endpoint }}
   minio:
diff --git a/chart/templates/haproxy/values.yaml b/chart/templates/haproxy/values.yaml
index 7fa5efb750a3332fa80e68aac63cfe1b66f905bd..8b58f696ab4d5959f9b914e9d4dba50b298a16b1 100644
--- a/chart/templates/haproxy/values.yaml
+++ b/chart/templates/haproxy/values.yaml
@@ -3,7 +3,10 @@
 {{- end }}
 
 {{- define "bigbang.defaults.haproxy-sso" -}}
-hostname: {{ .Values.hostname }}
+# hostname is deprecated and replaced with domain. But if hostname exists then use it.
+{{- $domainName := default .Values.domain .Values.hostname }}
+hostname: {{ $domainName }}
+domain: {{ $domainName }}
 
 istio:
   gateway: {{ default "public" .Values.addons.haproxy.ingress.gateway }}
@@ -75,12 +78,12 @@ config: |
     {{- if hasKey $alertmanagerHostValues "hosts" }}
     acl host_alertmanager hdr(host) -i {{ range .Values.monitoring.values.istio.alertmanager.hosts }}{{ tpl . $}}{{ end }}
     {{- else }}
-    acl host_alertmanager hdr(host) -i alertmanager.{{ .Values.hostname }}
+    acl host_alertmanager hdr(host) -i alertmanager.{{ $domainName }}
     {{- end }}
     {{- if hasKey $prometheusHostValues "hosts" }}
     acl host_prometheus hdr(host) -i {{ range .Values.monitoring.values.istio.prometheus.hosts }}{{ tpl . $}}{{ end }}
     {{- else }}
-    acl host_prometheus hdr(host) -i prometheus.{{ .Values.hostname }}
+    acl host_prometheus hdr(host) -i prometheus.{{ $domainName }}
     {{- end }}
 
     option forwardfor
diff --git a/chart/templates/istio/controlplane/values.yaml b/chart/templates/istio/controlplane/values.yaml
index 55941e21f156990674c46a530d7b98914df524d8..b30d95b7aa92c9cb9af13bdaef24fa0528fd638d 100644
--- a/chart/templates/istio/controlplane/values.yaml
+++ b/chart/templates/istio/controlplane/values.yaml
@@ -3,7 +3,9 @@
 {{- end }}
 
 {{- define "bigbang.defaults.istio" -}}
-hostname: {{ .Values.hostname }}
+# hostname is deprecated and replaced with domain. But if hostname exists then use it.
+{{- $domainName := default .Values.domain .Values.hostname }}
+domain: {{ $domainName }}
 
 tracing:
   enabled:  {{ .Values.jaeger.enabled }}
diff --git a/chart/templates/jaeger/values.yaml b/chart/templates/jaeger/values.yaml
index cabe3f2106ab8d71fd3234817a6f9ad012f8d4ab..ad788c21edbbc2d2263a4447cc675c44d9ae2255 100644
--- a/chart/templates/jaeger/values.yaml
+++ b/chart/templates/jaeger/values.yaml
@@ -5,7 +5,12 @@
 {{- define "bigbang.defaults.jaeger" -}}
 imagePullSecrets:
   - name: private-registry
-hostname: {{ .Values.hostname }}
+
+# hostname is deprecated and replaced with domain. But if hostname exists then use it.
+{{- $domainName := default .Values.domain .Values.hostname }}
+hostname: {{ $domainName }}
+domain: {{ $domainName }}
+
 istio:
   enabled: {{ .Values.istio.enabled }}
   jaeger:
diff --git a/chart/templates/keycloak/values.yaml b/chart/templates/keycloak/values.yaml
index d648e12f15542f07706d0346c7b3f526cc066a8f..47cdb5d562eb21bbe990f920c9d94f146758dcb7 100644
--- a/chart/templates/keycloak/values.yaml
+++ b/chart/templates/keycloak/values.yaml
@@ -8,7 +8,10 @@ replicas: 2
 imagePullSecrets:
 - name: private-registry
 
-hostname: {{ .Values.hostname }}
+# hostname is deprecated and replaced with domain. But if hostname exists then use it.
+{{- $domainName := default .Values.domain .Values.hostname }}
+hostname: {{ $domainName }}
+domain: {{ $domainName }}
 
 openshift: {{ .Values.openshift }}
 
diff --git a/chart/templates/kiali/values.yaml b/chart/templates/kiali/values.yaml
index 900d159ed3a3024e60cb62016c88122e9c2d74b2..255b6805930e76da219fc2962a29d5beba63830c 100644
--- a/chart/templates/kiali/values.yaml
+++ b/chart/templates/kiali/values.yaml
@@ -3,7 +3,10 @@
 {{- end }}
 
 {{- define "bigbang.defaults.kiali" -}}
-hostname: {{ .Values.hostname }}
+# hostname is deprecated and replaced with domain. But if hostname exists then use it.
+{{- $domainName := default .Values.domain .Values.hostname }}
+hostname: {{ $domainName }}
+domain: {{ $domainName }}
 
 openshift: {{ .Values.openshift}}
 
@@ -39,7 +42,7 @@ cr:
       grafana:
         enabled: {{ dig "grafana" "enabled" true .Values.monitoring.values }}
         {{- $grafanaUrl := first (dig "istio" "grafana" "hosts" list .Values.monitoring.values) }}
-        url: https://{{ tpl ($grafanaUrl | default (printf "%s.%s" "grafana" .Values.hostname)) . }}
+        url: https://{{ tpl ($grafanaUrl | default (printf "%s.%s" "grafana" $domainName)) . }}
         {{- if (dig "grafana" "enabled" true .Values.monitoring.values) }}
         auth:
           {{- if (dig "grafana" "admin" "existingSecret" "" .Values.monitoring.values) }}
@@ -55,7 +58,7 @@ cr:
       tracing:
         enabled: {{ .Values.jaeger.enabled }}
         {{- $tracingUrl := first (dig "istio" "jaeger" "hosts" list .Values.jaeger.values) }}
-        url: https://{{ tpl ($tracingUrl | default (printf "%s.%s" "tracing" .Values.hostname)) . }}
+        url: https://{{ tpl ($tracingUrl | default (printf "%s.%s" "tracing" $domainName )) . }}
       istio:
         component_status:
           components:
diff --git a/chart/templates/logging/elasticsearch-kibana/values.yaml b/chart/templates/logging/elasticsearch-kibana/values.yaml
index 7ca554c0f9457ecc51e1f5d4fb8adf3852571309..3d88b621612dc51cb873950173feece9c32f97f4 100644
--- a/chart/templates/logging/elasticsearch-kibana/values.yaml
+++ b/chart/templates/logging/elasticsearch-kibana/values.yaml
@@ -3,7 +3,10 @@
 {{- end }}
 
 {{- define "bigbang.defaults.logging" -}}
-hostname: {{ .Values.hostname }}
+# hostname is deprecated and replaced with domain. But if hostname exists then use it.
+{{- $domainName := default .Values.domain .Values.hostname }}
+hostname: {{ $domainName }}
+domain: {{ $domainName }}
 
 openshift: {{ .Values.openshift }}
 
diff --git a/chart/templates/mattermost/mattermost/values.yaml b/chart/templates/mattermost/mattermost/values.yaml
index 46fba1438e19b56d71527bcfd991f958d97af9de..9a4c3ff83eceaf602539bc8aeb563ee4ba41a5f5 100644
--- a/chart/templates/mattermost/mattermost/values.yaml
+++ b/chart/templates/mattermost/mattermost/values.yaml
@@ -3,7 +3,10 @@
 {{- end }}
 
 {{- define "bigbang.defaults.mattermost" -}}
-hostname: {{ .Values.hostname }}
+# hostname is deprecated and replaced with domain. But if hostname exists then use it.
+{{- $domainName := default .Values.domain .Values.hostname }}
+hostname: {{ $domainName }}
+domain: {{ $domainName }}
 
 openshift: {{ .Values.openshift }}
 
diff --git a/chart/templates/minio/minio/values.yaml b/chart/templates/minio/minio/values.yaml
index 46e0da144f448525bbf493ddb202064692db20ef..a6c59be5ac80b810812c30cf44fc67511e63dd0d 100644
--- a/chart/templates/minio/minio/values.yaml
+++ b/chart/templates/minio/minio/values.yaml
@@ -3,7 +3,10 @@
 {{- end }}
 
 {{- define "bigbang.defaults.minio" -}}
-hostname: {{ .Values.hostname }}
+# hostname is deprecated and replaced with domain. But if hostname exists then use it.
+{{- $domainName := default .Values.domain .Values.hostname }}
+hostname: {{ $domainName }}
+domain: {{ $domainName }}
 
 istio:
   enabled: {{ .Values.istio.enabled }}
diff --git a/chart/templates/monitoring/values.yaml b/chart/templates/monitoring/values.yaml
index ee8796805eab5f5f9dd7e6e33a6516e9461c3a12..b5d9fd7e1539214ccb1238e4acdf39bc0c872e6f 100644
--- a/chart/templates/monitoring/values.yaml
+++ b/chart/templates/monitoring/values.yaml
@@ -3,7 +3,10 @@
 {{- end }}
 
 {{- define "bigbang.defaults.monitoring" -}}
-hostname: {{ .Values.hostname }}
+# hostname is deprecated and replaced with domain. But if hostname exists then use it.
+{{- $domainName := default .Values.domain .Values.hostname }}
+hostname: {{ $domainName }}
+domain: {{ $domainName }}
 
 flux:
   enabled: true
@@ -61,7 +64,7 @@ grafana:
   grafana.ini:
     {{- if .Values.istio.enabled }}
     server:
-      root_url: https://grafana.{{ .Values.hostname }}/
+      root_url: https://grafana.{{ $domainName }}/
     {{- end }}
 
     auth:
diff --git a/chart/templates/nexus-repository-manager/values.yaml b/chart/templates/nexus-repository-manager/values.yaml
index 9ba4c6b508ed8819596da6be980f6a9cc6e291b4..ee764514d45129cd8961572d65d2bd7f2766ac87 100644
--- a/chart/templates/nexus-repository-manager/values.yaml
+++ b/chart/templates/nexus-repository-manager/values.yaml
@@ -3,7 +3,8 @@
 {{- end }}
 
 {{- define "bigbang.defaults.nexus-repository-manager" -}}
-domain: {{ .Values.hostname }}
+{{- $domainName := default .Values.domain .Values.hostname }}
+domain: {{ $domainName }}
 hostname: nexus
 istio:
   enabled: {{ .Values.istio.enabled }}
@@ -33,7 +34,7 @@ license_key: "{{ .Values.addons.nexus.license_key }}"
 sso:
   enabled: {{ .Values.addons.nexus.sso.enabled }}
   idp_data:
-    entityId: "https://nexus.{{ .Values.hostname }}/service/rest/v1/security/saml/metadata"
+    entityId: "https://nexus.{{ $domainName }}/service/rest/v1/security/saml/metadata"
     usernameAttribute: "{{ .Values.addons.nexus.sso.idp_data.username }}"
     firstNameAttribute: "{{ .Values.addons.nexus.sso.idp_data.firstName }}"
     lastNameAttribute: "{{ .Values.addons.nexus.sso.idp_data.lastName }}"
diff --git a/chart/templates/sonarqube/values.yaml b/chart/templates/sonarqube/values.yaml
index 0e36d091c51fff674d4ef6a5a9a6a153d0d20cba..a56faec4032fbaeb6137f5ce00085b186d6cb095 100644
--- a/chart/templates/sonarqube/values.yaml
+++ b/chart/templates/sonarqube/values.yaml
@@ -3,7 +3,10 @@
 {{- end }}
 
 {{- define "bigbang.defaults.sonarqube" -}}
-hostname: {{ .Values.hostname }}
+# hostname is deprecated and replaced with domain. But if hostname exists then use it.
+{{- $domainName := default .Values.domain .Values.hostname }}
+hostname: {{ $domainName }}
+domain: {{ $domainName }}
 
 istio:
   enabled: {{ .Values.istio.enabled }}
@@ -27,7 +30,7 @@ image:
 {{- if .Values.addons.sonarqube.sso.enabled }}
 sonarProperties:
   sonar.auth.saml.enabled: {{ .Values.addons.sonarqube.sso.enabled }}
-  sonar.core.serverBaseURL: https://sonarqube.{{ .Values.hostname }}
+  sonar.core.serverBaseURL: https://sonarqube.{{ $domainName }}
   sonar.auth.saml.applicationId: {{ .Values.addons.sonarqube.sso.client_id }}
   sonar.auth.saml.providerName: {{ .Values.addons.sonarqube.sso.provider_name | default .Values.addons.sonarqube.sso.label }}
   sonar.auth.saml.providerId: https://{{ .Values.sso.oidc.host }}/auth/realms/{{ .Values.sso.oidc.realm }}
diff --git a/chart/templates/twistlock/values.yaml b/chart/templates/twistlock/values.yaml
index f2bc784eeda491d1d7ce6c46e50368060a6159e5..5b84d55610b04fcf6f8c6c02af0742e62617c8e6 100644
--- a/chart/templates/twistlock/values.yaml
+++ b/chart/templates/twistlock/values.yaml
@@ -3,7 +3,10 @@
 {{- end }}
 
 {{- define "bigbang.defaults.twistlock" -}}
-hostname: {{ .Values.hostname }}
+# hostname is deprecated and replaced with domain. But if hostname exists then use it.
+{{- $domainName := default .Values.domain .Values.hostname }}
+hostname: {{ $domainName }}
+domain: {{ $domainName }}
 
 openshift: {{ .Values.openshift }}
 
diff --git a/chart/templates/velero/values.yaml b/chart/templates/velero/values.yaml
index 59645314b9376e33850af9991334b9d4e4af8fdf..1792ba41b441c94b5fc844342d56b7de6dfb2544 100644
--- a/chart/templates/velero/values.yaml
+++ b/chart/templates/velero/values.yaml
@@ -3,7 +3,6 @@
 {{- end }}
 
 {{- define "bigbang.defaults.velero" -}}
-hostname: {{ .Values.hostname }}
 
 istio:
   enabled: {{ .Values.istio.enabled }}
diff --git a/chart/values.yaml b/chart/values.yaml
index 4120dd6c1b0467665f1cc1d2bf7464e0e1b1c486..ed43344244ef4f462735a7820ef2b0ae1567fdd6 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -1,5 +1,5 @@
 # -- Domain used for BigBang created exposed services, can be overridden by individual packages.
-hostname: bigbang.dev
+domain: bigbang.dev
 
 # -- (experimental) Toggle sourcing from external repos.
 # All this does right now is toggle GitRepositories, it is _not_ fully functional
@@ -140,21 +140,21 @@ istio:
     public:
       ingressGateway: "public-ingressgateway"
       hosts:
-      - "*.{{ .Values.hostname }}"
+      - "*.{{ .Values.domain }}"
       tls:
         key: ""
         cert: ""
     # private:
     #   ingressGateway: "private-ingressgateway"
     #   hosts:
-    #   - "*.{{ .Values.hostname }}"
+    #   - "*.{{ .Values.domain }}"
     #   tls:
     #     key: ""
     #     cert: ""
     # passthrough:
     #   ingressGateway: "passthrough-ingressgateway"
     #   hosts:
-    #   - "*.{{ .Values.hostname }}"
+    #   - "*.{{ .Values.domain }}"
     #   tls:
     #     mode: "PASSTHROUGH"