diff --git a/chart/templates/uds-package.yaml b/chart/templates/uds-package.yaml
index 695beb67..766addb0 100644
--- a/chart/templates/uds-package.yaml
+++ b/chart/templates/uds-package.yaml
@@ -43,12 +43,6 @@ spec:
         host: sonarqube
         port: 9000
     allow:
-      # Todo: wide open for hitting in-cluster or external postgres
-      - direction: Egress
-        podLabels:
-          app: sonarqube
-        remoteGenerated: Anywhere
-
       - direction: Egress
         remoteNamespace: keycloak
         remoteSelector:
@@ -59,7 +53,9 @@ spec:
         description: "SSO Internal"
 
       - direction: Egress
-        remoteGenerated: Anywhere
+        remoteNamespace: istio-tenant-gateway
+        remoteSelector:
+          app: tenant-ingressgateway
         selector:
           app: sonarqube
         port: 443