diff --git a/playbooks/inventory/group_vars/neutron_agent.yml b/playbooks/inventory/group_vars/neutron_agent.yml
index 1533d7d9b4..fcd7746547 100644
--- a/playbooks/inventory/group_vars/neutron_agent.yml
+++ b/playbooks/inventory/group_vars/neutron_agent.yml
@@ -15,3 +15,6 @@
 
 lxc_container_config_list:
   - "lxc.aa_profile=unconfined"
+
+# Ensure that all neutron agent containers get a fixed mac address
+lxc_container_fixed_mac: true
diff --git a/playbooks/inventory/group_vars/rabbitmq_all.yml b/playbooks/inventory/group_vars/rabbitmq_all.yml
index c0807d7f37..2be7b7d3dd 100644
--- a/playbooks/inventory/group_vars/rabbitmq_all.yml
+++ b/playbooks/inventory/group_vars/rabbitmq_all.yml
@@ -17,3 +17,6 @@ rabbitmq_cluster_name: openstack
 
 # Ensure that the package state matches the global setting
 rabbitmq_package_state: "{{ package_state }}"
+
+# Ensure that all rabbitmq containers get a fixed mac address
+lxc_container_fixed_mac: true