diff --git a/roles/network_plugin/cilium/templates/hubble/deploy.yml.j2 b/roles/network_plugin/cilium/templates/hubble/deploy.yml.j2
index 86533e6e7..f0153d64d 100644
--- a/roles/network_plugin/cilium/templates/hubble/deploy.yml.j2
+++ b/roles/network_plugin/cilium/templates/hubble/deploy.yml.j2
@@ -43,6 +43,11 @@ spec:
           ports:
             - name: grpc
               containerPort: 4245
+{% if cilium_enable_prometheus %}
+            - name: prometheus
+              containerPort: 9966
+              protocol: TCP
+{% endif %}
           readinessProbe:
             tcpSocket:
               port: grpc
diff --git a/roles/network_plugin/cilium/templates/hubble/service.yml.j2 b/roles/network_plugin/cilium/templates/hubble/service.yml.j2
index f1df0ebb2..0f862a9c5 100644
--- a/roles/network_plugin/cilium/templates/hubble/service.yml.j2
+++ b/roles/network_plugin/cilium/templates/hubble/service.yml.j2
@@ -8,7 +8,7 @@ metadata:
   namespace: kube-system
   annotations:
     prometheus.io/scrape: 'true'
-    prometheus.io/port: "9091"
+    prometheus.io/port: "{{ cilium_hubble_scrape_port }}"
   labels:
     k8s-app: hubble
 spec:
@@ -31,6 +31,9 @@ metadata:
   namespace: kube-system
   labels:
     k8s-app: hubble-relay
+  annotations:
+    prometheus.io/scrape: 'true'
+    prometheus.io/port: "9966"
 spec:
   clusterIP: None
   type: ClusterIP