diff --git a/tasks/main.yml b/tasks/main.yml
index 326904ea..47418e04 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -169,17 +169,20 @@
   when:
     - octavia_neutron_management_network_uuid is not defined
     - octavia_neutron_management_network_name is defined
+    - _octavia_is_first_play_host
   tags:
     - octavia-install
     - octavia-config
 
 - import_tasks: octavia_security_group.yml
-  run_once: true
+  when:
+    - _octavia_is_first_play_host
   tags:
     - octavia-install
 
 - import_tasks: octavia_flavor_create.yml
   when:
+    - _octavia_is_first_play_host
     - octavia_nova_flavor_uuid is not defined
   tags:
     - octavia-install
@@ -202,7 +205,8 @@
     - octavia-config
 
 - import_tasks: octavia_amp_image.yml
-  run_once: true
+  when:
+    - _octavia_is_first_play_host
   tags:
     - octavia-config
 
diff --git a/tasks/octavia_flavor_create.yml b/tasks/octavia_flavor_create.yml
index ed061341..16b94841 100644
--- a/tasks/octavia_flavor_create.yml
+++ b/tasks/octavia_flavor_create.yml
@@ -24,7 +24,6 @@
     ansible_python_interpreter: "{{ octavia_service_setup_host_python_interpreter }}"
   block:
     - name: Create Octavia Flavor
-      run_once: true
       openstack.cloud.compute_flavor:
         auth:
           auth_url: "{{ keystone_service_adminurl }}"