diff --git a/roles/network_plugin/cilium/defaults/main.yml b/roles/network_plugin/cilium/defaults/main.yml
index bdf7a346a..2bb1fdad5 100755
--- a/roles/network_plugin/cilium/defaults/main.yml
+++ b/roles/network_plugin/cilium/defaults/main.yml
@@ -23,6 +23,8 @@ cilium_tunnel_mode: vxlan
 # Optional features
 cilium_enable_prometheus: false
 cilium_enable_hubble_metrics: false
+cilium_enable_hubble: false
+cilium_hubble_metrics: ""
 # Enable if you want to make use of hostPort mappings
 cilium_enable_portmap: false
 # Monitor aggregation level (none/low/medium/maximum)
diff --git a/roles/network_plugin/cilium/templates/cilium-config.yml.j2 b/roles/network_plugin/cilium/templates/cilium-config.yml.j2
index 462ee6d25..4385f3bae 100644
--- a/roles/network_plugin/cilium/templates/cilium-config.yml.j2
+++ b/roles/network_plugin/cilium/templates/cilium-config.yml.j2
@@ -145,3 +145,13 @@ data:
 
   native-routing-cidr: "{{ cilium_native_routing_cidr }}"
   auto-direct-node-routes: "{{ cilium_auto_direct_node_routes }}"
+
+  # Hubble settings
+{% if cilium_enable_hubble %}
+  enable-hubble: "true"
+  hubble-metrics: "{{ cilium_hubble_metrics }}"
+  hubble-listen-address: ":4244"
+{% if cilium_enable_hubble_metrics %}
+  hubble-metrics-server: ":9091"
+{% endif %}
+{% endif %}