diff --git a/helm/values.yaml.j2 b/helm/values.yaml.j2
index 5e013ca..8f2db90 100644
--- a/helm/values.yaml.j2
+++ b/helm/values.yaml.j2
@@ -55,11 +55,14 @@ networkPolicy:
     - Egress
   egressRules:
     - to:
-        - ipBlock:
-            cidr: "{{ DB_HOST }}/32"
+        - namespaceSelector:
+            matchLabels:
+              kubernetes.io/metadata.name: proxysql
       ports:
         - protocol: TCP
           port: 3306
+        - protocol: TCP
+          port: 6033
     - to:
         - namespaceSelector:
             matchLabels:
diff --git a/templates/datasources.yaml.j2 b/templates/datasources.yaml.j2
index a25c64d..20943ff 100644
--- a/templates/datasources.yaml.j2
+++ b/templates/datasources.yaml.j2
@@ -22,7 +22,7 @@ datasources:
     editable: False
   - name: block-data
     type: mysql
-    url: {{ DB_HOST }}:3306
+    url: "proxysql-generic.proxysql:3306"
     uid: P00A25F4DA48796D5
     user: '{{ GRAFANA_PUB_READ_USERNAME }}'
     jsonData: