diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000000000000000000000000000000000..5b462cccdadf92874f22e8ef07043baace8eebf9
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,4 @@
+root = true
+
+[*]
+insert_final_newline = true
diff --git a/devops/azure/override-stages.yml b/devops/azure/override-stages.yml
index 2a39df5a7bbdbe7b8e9fa0dbbb5ab5c14e47ffbf..a8165a10806cc4f6b15c05ec958d789f4aad7207 100644
--- a/devops/azure/override-stages.yml
+++ b/devops/azure/override-stages.yml
@@ -34,7 +34,7 @@ azure_containerize:
 
   only:
     variables:
-      - $AZURE == 'true'
+      - $AZURE == '1'
 
 azure_bootstrap:
   stage: bootstrap
@@ -48,7 +48,7 @@ azure_bootstrap:
     - $AZURE_DEPLOYMENTS_SUBDIR/bootstrap.sh
   only:
     variables:
-      - $AZURE == 'true'
+      - $AZURE == '1'
 
 azure_test_py:
   extends:
@@ -62,7 +62,7 @@ azure_test_py:
     - ./run-integration-tests.sh
   only:
     variables:
-      - $AZURE == 'true'
+      - $AZURE == '1'
   artifacts:
     when: on_failure
     paths:
diff --git a/devops/gcp/deploy/templates/virtual-service.yaml b/devops/gcp/deploy/templates/virtual-service.yaml
index 5214685fd1031f71bf3be6b39fb01ee77dfa30c5..4b167ea47bc8d2deba1f29ea5392f2169614ec1c 100644
--- a/devops/gcp/deploy/templates/virtual-service.yaml
+++ b/devops/gcp/deploy/templates/virtual-service.yaml
@@ -5,8 +5,10 @@ metadata:
   namespace: "{{ .Release.Namespace }}"
 spec:
   hosts:
-    {{- if .Values.conf.domain }}
+    {{- if and .Values.conf.domain .Values.conf.onPremEnabled }}
     - {{ printf "osdu.%s" .Values.conf.domain | quote }}
+    {{- else if .Values.conf.domain }}
+    - {{ .Values.conf.domain | quote }}
     {{- else }}
     - "*"
     {{- end }}
diff --git a/devops/gcp/pipeline/override-stages.yml b/devops/gcp/pipeline/override-stages.yml
index 573a4d3a05fcd6b302d63c46b756b292b3c8d66a..43c109d203727c23906698c0799e57074c960204 100644
--- a/devops/gcp/pipeline/override-stages.yml
+++ b/devops/gcp/pipeline/override-stages.yml
@@ -71,11 +71,11 @@ osdu-gcp-deploy-configmap-opa:
       --history-max=3
       $OSDU_GCP_HELM_OPA_CONFIG_SERVICE_VARS
   rules:
-    - if: '$OSDU_GCP == "true" && $CI_COMMIT_BRANCH =~ /^release/'
+    - if: '$OSDU_GCP == "1" && $CI_COMMIT_BRANCH =~ /^release/'
       when: never
-    - if: '$OSDU_GCP == "true" && $CI_COMMIT_TAG'
+    - if: '$OSDU_GCP == "1" && $CI_COMMIT_TAG'
       when: never
-    - if: '$OSDU_GCP == "true"'
+    - if: '$OSDU_GCP == "1"'
       when: on_success
 
 osdu-gcp-dev2-deploy-configmap-opa:
@@ -95,9 +95,9 @@ osdu-gcp-dev2-deploy-configmap-opa:
       --set data.bucket_name=$OSDU_GCP_POLICY_BUCKET
       --set conf.data_partition_id=devtwo
   rules:
-    - if: '$OSDU_GCP == "true" && $CI_COMMIT_BRANCH =~ /^release/'
+    - if: '$OSDU_GCP == "1" && $CI_COMMIT_BRANCH =~ /^release/'
       when: on_success
-    - if: '$OSDU_GCP == "true" && $CI_COMMIT_TAG'
+    - if: '$OSDU_GCP == "1" && $CI_COMMIT_TAG'
       when: on_success
 
 osdu-gcp-deploy-opa:
@@ -117,11 +117,11 @@ osdu-gcp-deploy-opa:
       --history-max=3
     - !reference [.verify_deploy, script]
   rules:
-    - if: '$OSDU_GCP == "true" && $CI_COMMIT_BRANCH =~ /^release/'
+    - if: '$OSDU_GCP == "1" && $CI_COMMIT_BRANCH =~ /^release/'
       when: never
-    - if: '$OSDU_GCP == "true" && $CI_COMMIT_TAG'
+    - if: '$OSDU_GCP == "1" && $CI_COMMIT_TAG'
       when: never
-    - if: '$OSDU_GCP == "true"'
+    - if: '$OSDU_GCP == "1"'
       when: on_success
 
 osdu-gcp-dev2-deploy-opa:
@@ -141,9 +141,9 @@ osdu-gcp-dev2-deploy-opa:
       --history-max=3
     - !reference [.verify_deploy, script]
   rules:
-    - if: '$OSDU_GCP == "true" && $CI_COMMIT_BRANCH =~ /^release/'
+    - if: '$OSDU_GCP == "1" && $CI_COMMIT_BRANCH =~ /^release/'
       when: on_success
-    - if: '$OSDU_GCP == "true" && $CI_COMMIT_TAG'
+    - if: '$OSDU_GCP == "1" && $CI_COMMIT_TAG'
       when: on_success
 
 osdu-gcp-bootstrap:
@@ -162,11 +162,11 @@ osdu-gcp-bootstrap:
     - mv bundle-$DATA_PARTITION.tar.gz ./policies
     - gsutil rsync policies gs://$OSDU_GCP_POLICY_BUCKET/
   rules:
-    - if: '$OSDU_GCP == "true" && $CI_COMMIT_BRANCH =~ /^release/'
+    - if: '$OSDU_GCP == "1" && $CI_COMMIT_BRANCH =~ /^release/'
       when: never
-    - if: '$OSDU_GCP == "true" && $CI_COMMIT_TAG'
+    - if: '$OSDU_GCP == "1" && $CI_COMMIT_TAG'
       when: never
-    - if: '$OSDU_GCP == "true"'
+    - if: '$OSDU_GCP == "1"'
       when: on_success
 
 osdu-gcp-bootstrap-bundle:
@@ -185,11 +185,11 @@ osdu-gcp-bootstrap-bundle:
     - mv bundle-$DATA_PARTITION.tar.gz ./policies
     - gsutil rsync policies gs://$OSDU_GCP_POLICY_BUCKET/
   rules:
-    - if: '$OSDU_GCP == "true" && $CI_COMMIT_BRANCH =~ /^release/'
+    - if: '$OSDU_GCP == "1" && $CI_COMMIT_BRANCH =~ /^release/'
       when: never
-    - if: '$OSDU_GCP == "true" && $CI_COMMIT_TAG'
+    - if: '$OSDU_GCP == "1" && $CI_COMMIT_TAG'
       when: never
-    - if: '$OSDU_GCP == "true"'
+    - if: '$OSDU_GCP == "1"'
       when: on_success
 
 osdu-gcp-dev2-bootstrap-bundle:
@@ -208,9 +208,9 @@ osdu-gcp-dev2-bootstrap-bundle:
     - mv bundle-$DATA_PARTITION.tar.gz ./policies
     - gsutil rsync policies gs://$OSDU_GCP_POLICY_BUCKET/
   rules:
-    - if: '$OSDU_GCP == "true" && $CI_COMMIT_BRANCH =~ /^release/'
+    - if: '$OSDU_GCP == "1" && $CI_COMMIT_BRANCH =~ /^release/'
       when: on_success
-    - if: '$OSDU_GCP == "true" && $CI_COMMIT_TAG'
+    - if: '$OSDU_GCP == "1" && $CI_COMMIT_TAG'
       when: on_success
 
 osdu-gcp-dev2-bootstrap:
@@ -229,9 +229,9 @@ osdu-gcp-dev2-bootstrap:
     - mv bundle-$DATA_PARTITION.tar.gz ./policies
     - gsutil rsync policies gs://$OSDU_GCP_POLICY_BUCKET/
   rules:
-    - if: '$OSDU_GCP == "true" && $CI_COMMIT_BRANCH =~ /^release/'
+    - if: '$OSDU_GCP == "1" && $CI_COMMIT_BRANCH =~ /^release/'
       when: on_success
-    - if: '$OSDU_GCP == "true" && $CI_COMMIT_TAG'
+    - if: '$OSDU_GCP == "1" && $CI_COMMIT_TAG'
       when: on_success
 
 osdu-gcp-test-python:
@@ -274,7 +274,7 @@ osdu-gcp-anthos-deploy-configmap:
       when: never
     - if: "$CI_COMMIT_TAG"
       when: never
-    - if: '$OSDU_GCP == "true"'
+    - if: '$OSDU_GCP == "1"'
       when: never
 
 osdu-gcp-anthos-deploy-deployment:
@@ -283,7 +283,7 @@ osdu-gcp-anthos-deploy-deployment:
       when: never
     - if: "$CI_COMMIT_TAG"
       when: never
-    - if: '$OSDU_GCP == "true"'
+    - if: '$OSDU_GCP == "1"'
       when: never
 
 osdu-gcp-anthos-test:
@@ -292,7 +292,7 @@ osdu-gcp-anthos-test:
       when: never
     - if: "$CI_COMMIT_TAG"
       when: never
-    - if: '$OSDU_GCP == "true"'
+    - if: '$OSDU_GCP == "1"'
       when: never
 
 osdu-gcp-anthos-test-python:
@@ -301,5 +301,5 @@ osdu-gcp-anthos-test-python:
       when: never
     - if: "$CI_COMMIT_TAG"
       when: never
-    - if: '$OSDU_GCP == "true" && $OSDU_GCP_INT_TEST_TYPE == "python"'
+    - if: '$OSDU_GCP == "1" && $OSDU_GCP_INT_TEST_TYPE == "python"'
       when: never
diff --git a/devops/ibm/bootstrap-bundle.yml b/devops/ibm/bootstrap-bundle.yml
index 092dc415b7dc634fed2ce10e43efd498bab3ebc3..8b76f2a1f905a2ba76c72fbcca7d92fff439370d 100644
--- a/devops/ibm/bootstrap-bundle.yml
+++ b/devops/ibm/bootstrap-bundle.yml
@@ -15,4 +15,4 @@ ibm_bootstrap:
     - ./mc cp bundle.tar.gz bundle-server/$IBM_OPA_BUNDLE_SERVER_BUCKET/
   only:
     variables:
-      - $IBM == 'true'
\ No newline at end of file
+      - $IBM == '1'
diff --git a/devops/ibm/bootstrap.yml b/devops/ibm/bootstrap.yml
index 7a1ace1a9148631a0e50ab334ebe83df5730ee29..cbeb90f78f4a992681da128b252c37a42dfdd7fe 100644
--- a/devops/ibm/bootstrap.yml
+++ b/devops/ibm/bootstrap.yml
@@ -10,10 +10,10 @@ ibm_bootstrap:
     - $IBM_DEPLOYMENTS_SUBDIR/bootstrap.sh
   only:
     variables:
-      - $IBM == 'true'
+      - $IBM == '1'
 
 ibm-test:
   needs: ["ibm_bootstrap"]
   only:
     variables:
-      - $IBM == 'true'
+      - $IBM == '1'