diff --git a/charts/shield/Chart.yaml b/charts/shield/Chart.yaml
index 190a88a57..caf709580 100644
--- a/charts/shield/Chart.yaml
+++ b/charts/shield/Chart.yaml
@@ -13,5 +13,5 @@ maintainers:
   - name: mavimo
     email: marcovito.moscaritolo@sysdig.com
 type: application
-version: 1.3.3
+version: 1.3.4
 appVersion: "1.0.0"
diff --git a/charts/shield/templates/cluster/_config.tpl b/charts/shield/templates/cluster/_config.tpl
index 60ad59949..85aad231d 100644
--- a/charts/shield/templates/cluster/_config.tpl
+++ b/charts/shield/templates/cluster/_config.tpl
@@ -42,6 +42,9 @@
     {{- if and .Values.sysdig_endpoint.collector.host .Values.sysdig_endpoint.collector.port -}}
       {{- $_ := set $sysdigEndpointConfig "collector" (printf "%s:%d" .Values.sysdig_endpoint.collector.host (.Values.sysdig_endpoint.collector.port | int)) -}}
     {{- end -}}
+    {{- if and (not .Values.sysdig_endpoint.api_url) (ne "custom" .Values.sysdig_endpoint.region) -}}
+      {{- $_ := unset $sysdigEndpointConfig "api_url" -}}
+    {{- end -}}
     {{- $_ := set $config "sysdig_endpoint" $sysdigEndpointConfig -}}
     {{- $_ := set $config "cluster_config" (dict "name" .Values.cluster_config.name) -}}
     {{- $clusterConfig := dict "name" .Values.cluster_config.name -}}
diff --git a/charts/shield/templates/common/_regions.tpl b/charts/shield/templates/common/_regions.tpl
index 4117648e2..f045d9d8f 100644
--- a/charts/shield/templates/common/_regions.tpl
+++ b/charts/shield/templates/common/_regions.tpl
@@ -180,8 +180,8 @@
 
 {{- define "common.collector_endpoint" }}
   {{- $regions := fromYaml (include "common.regions" .) }}
-  {{- if ne "custom" .Values.sysdig_endpoint.region }}
-    {{- get (get $regions .Values.sysdig_endpoint.region) "collector_endpoint"  }}
+  {{- if not .Values.sysdig_endpoint.collector.host }}
+    {{- get (get $regions .Values.sysdig_endpoint.region) "collector_endpoint" }}
   {{- else }}
     {{- .Values.sysdig_endpoint.collector.host }}
   {{- end }}
@@ -189,7 +189,7 @@
 
 {{- define "common.monitor_api_endpoint" }}
   {{- $regions := fromYaml (include "common.regions" .) }}
-  {{- if hasKey $regions .Values.sysdig_endpoint.region }}
+  {{- if not .Values.sysdig_endpoint.api_url }}
     {{- get (get $regions .Values.sysdig_endpoint.region) "monitor_api_endpoint" }}
   {{- else }}
     {{- .Values.sysdig_endpoint.api_url }}
@@ -198,7 +198,7 @@
 
 {{- define "common.secure_api_endpoint" }}
   {{- $regions := fromYaml (include "common.regions" .) }}
-  {{- if ne "custom" .Values.sysdig_endpoint.region }}
+  {{- if not .Values.sysdig_endpoint.api_url }}
     {{- get (get $regions .Values.sysdig_endpoint.region) "secure_api_endpoint" }}
   {{- else }}
     {{- .Values.sysdig_endpoint.api_url }}
@@ -207,9 +207,9 @@
 
 {{- define "common.secure_ui" }}
   {{- $regions := fromYaml (include "common.regions" .) }}
-  {{- if ne "custom" .Values.sysdig_endpoint.region }}
+  {{- if not .Values.sysdig_endpoint.api_url }}
     {{- get (get $regions .Values.sysdig_endpoint.region) "secure_ui" }}
   {{- else }}
-    {{- .Values.sysdig_endpoint.api_url}}
+    {{- .Values.sysdig_endpoint.api_url }}
   {{- end }}
 {{- end }}
diff --git a/charts/shield/tests/cluster/configmap_test.yaml b/charts/shield/tests/cluster/configmap_test.yaml
index ea6e1baa6..5dab430ed 100644
--- a/charts/shield/tests/cluster/configmap_test.yaml
+++ b/charts/shield/tests/cluster/configmap_test.yaml
@@ -306,3 +306,21 @@ tests:
             enabled: true
     asserts:
       - notFailedTemplate: {}
+
+  - it: Doesn't set api_url when region is us2 and collector host and port are set
+    set:
+      cluster_config:
+        name: shield-cluster
+      sysdig_endpoint:
+        region: us2
+        api_url:
+        collector:
+          host: fake.collector.host
+          port: 6443
+    asserts:
+      - matchRegex:
+          path: data['cluster-shield.yaml']
+          pattern: |
+            sysdig_endpoint:
+              collector: fake.collector.host:6443
+              region: us2
diff --git a/charts/shield/tests/common/regions_test.yaml b/charts/shield/tests/common/regions_test.yaml
index 67e878274..4f10cc2b9 100644
--- a/charts/shield/tests/common/regions_test.yaml
+++ b/charts/shield/tests/common/regions_test.yaml
@@ -11,19 +11,59 @@ tests:
     set:
       sysdig_endpoint:
         region: "eu1"
+        api_url:
+        collector:
+          host:
+          port:
     asserts:
       - matchRegex:
           path: data["dragent.yaml"]
           pattern: |
             collector: ingest-eu1.app.sysdig.com
-            collector_port: 6443
 
   - it: API endpoint validation
     set:
       sysdig_endpoint:
         region: "us1"
+        api_url:
+        collector:
+          host:
+          port:
     asserts:
       - matchRegex:
           path: data["dragent.yaml"]
           pattern: |
             sysdig_api_endpoint: secure.sysdig.com
+
+  - it: Collector and API endpoint validation when collector host and port set, but region is not custom and api_url is not set.
+    set:
+      cluster_config:
+        name: test-cluster
+      sysdig_endpoint:
+        region: "us2"
+        collector:
+          host: ingest-alt-us2.app.sysdig.com
+          port: 443
+        api_url:
+    asserts:
+      - matchRegex:
+          path: data["dragent.yaml"]
+          pattern: |
+            collector: ingest-alt-us2.app.sysdig.com
+            collector_port: 443
+      - matchRegex:
+          path: data["dragent.yaml"]
+          pattern: |
+            sysdig_api_endpoint: us2.app.sysdig.com
+
+  - it: Collector host, port and API endpoint validation when region is custom.
+    asserts:
+      - matchRegex:
+          path: data["dragent.yaml"]
+          pattern: |
+            collector: example.com
+            collector_port: 6443
+      - matchRegex:
+          path: data["dragent.yaml"]
+          pattern: |
+            sysdig_api_endpoint: https://www.example.com