diff --git a/openshift/gitlab.yml b/openshift/gitlab.yml
index 172e81ac5..84f215ced 100644
--- a/openshift/gitlab.yml
+++ b/openshift/gitlab.yml
@@ -101,6 +101,11 @@
       retries: 10
       delay: 30
 
+    - name: Grab url for Gitlab spec
+      ansible.builtin.set_fact:
+        cluster_domain: "apps{{ lookup('ansible.builtin.env', 'K8S_AUTH_HOST') | regex_search('\\.[^:]*') }}"
+      when: cluster_domain is undefined
+
     - name: Deploy a GitLab instance
       redhat.openshift.k8s:
         state: present
diff --git a/openshift/setup.yml b/openshift/setup.yml
index 1f8c5a615..d5db457a6 100644
--- a/openshift/setup.yml
+++ b/openshift/setup.yml
@@ -34,13 +34,3 @@ controller_templates:
     notification_templates_error: Telemetry
     credentials:
       - "OpenShift Credential"
-    survey_enabled: true
-    survey:
-      name: ''
-      description: ''
-      spec:
-        - question_name: Enter the base domain for your cluster
-          default: 'Example: apps.cluster-123ab.123ab.sandbox987.opentlc.com'
-          type: text
-          variable: cluster_domain
-          required: true