diff --git a/ansible/roles/openvswitch/defaults/main.yml b/ansible/roles/openvswitch/defaults/main.yml
index 06b1e566ef91994f87faaf35726557daa3187cd4..f24d73d63d94765da4d5d5911a6f3d097ed9463d 100644
--- a/ansible/roles/openvswitch/defaults/main.yml
+++ b/ansible/roles/openvswitch/defaults/main.yml
@@ -103,4 +103,5 @@ openvswitch_ovs_vsctl_wrapper_enabled: false
 #############
 
 openvswitch_system_id: "{{ ansible_facts.hostname }}"
+openvswitch_hostname: "{{ ansible_facts.hostname }}"
 openvswitch_hw_offload: "no"
diff --git a/ansible/roles/openvswitch/tasks/post-config.yml b/ansible/roles/openvswitch/tasks/post-config.yml
index 5b6146f4df3a231806c80a4b1efb1970bdfaa6d4..6edbbaed3d10de8bc0c23a2da31b0ce722443ee1 100644
--- a/ansible/roles/openvswitch/tasks/post-config.yml
+++ b/ansible/roles/openvswitch/tasks/post-config.yml
@@ -15,6 +15,7 @@
       state: "{{ item.state | default('present') }}"
   loop:
     - { col: "external_ids", name: "system-id", value: "{{ openvswitch_system_id }}" }
+    - { col: "external_ids", name: "hostname", value: "{{ openvswitch_hostname }}" }
     - { col: "other_config", name: "hw-offload", value: true, state: "{{ 'present' if openvswitch_hw_offload | bool else 'absent' }}" }
 
 - name: Ensuring OVS bridge is properly setup