diff --git a/chart/templates/gitlab/secret-sso.yaml b/chart/templates/gitlab/secret-sso.yaml
index d193123305d0f60aa66c956a2705f469f46137cd..324c6ce9a46bfaa4c23c58dccc19a39d67182039 100644
--- a/chart/templates/gitlab/secret-sso.yaml
+++ b/chart/templates/gitlab/secret-sso.yaml
@@ -24,7 +24,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 }}/users/auth/openid_connect/callback",
+          "redirect_uri": "https://{{ .Values.addons.gitlab.hostnames.gitlab }}.{{ .Values.hostname }}/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 06c05e43113aea610fb47b95161775f4929641b4..8f1c3836318d99d5e8a609f176cf5eaa2f5f5e9b 100644
--- a/chart/templates/gitlab/values.yaml
+++ b/chart/templates/gitlab/values.yaml
@@ -56,10 +56,10 @@ global:
     domain: {{ .Values.hostname }}
 
     gitlab:
-      name: {{ .Values.addons.gitlab.hostnames.gitlab }}
+      name: {{ .Values.addons.gitlab.hostnames.gitlab }}.{{ .Values.hostname }}
 
     registry:
-      name: {{ .Values.addons.gitlab.hostnames.registry }}
+      name: {{ .Values.addons.gitlab.hostnames.registry }}.{{ .Values.hostname }}
 
   {{- if .Values.addons.gitlab.objectStorage.endpoint }}
   minio:
diff --git a/chart/values.yaml b/chart/values.yaml
index 20ff8ed8bc62bc6f1c678afd217ebd29ed585fdb..98340fbd526036ba76453c8760624f610aa607fb 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -578,13 +578,14 @@ addons:
     enabled: false
 
     hostnames:
-      gitlab: gitlab.bigbang.dev
-      registry: registry.bigbang.dev
+      # host name only without the domain
+      gitlab: gitlab
+      registry: registry
 
     git:
       repo: https://repo1.dso.mil/platform-one/big-bang/apps/developer-tools/gitlab.git
       path: "./chart"
-      tag: "4.12.9-bb.2"
+      tag: "4.12.9-bb.3"
 
     # -- Flux reconciliation overrides specifically for the Gitlab Package
     flux: {}