diff --git a/tasks/lxc_net.yml b/tasks/lxc_net.yml
index 11bfbdca..21c31bea 100644
--- a/tasks/lxc_net.yml
+++ b/tasks/lxc_net.yml
@@ -22,6 +22,18 @@
     - lxc-net
     - lxc-interfaces
 
+- name: Drop lxc net bridge
+  template:
+    src: "lxc-net-bridge.cfg.j2"
+    dest: "/etc/network/interfaces.d/lxc-net-bridge.cfg"
+    owner: "root"
+    group: "root"
+    mode: "0644"
+  tags:
+    - lxc-files
+    - lxc-net
+    - lxc-bridge
+
 - name: Check Container Bridge exists
   file:
     state: "file"
@@ -34,15 +46,3 @@
   tags:
     - lxc-net
     - lxc-bridge
-
-- name: Drop lxc net bridge
-  template:
-    src: "lxc-net-bridge.cfg.j2"
-    dest: "/etc/network/interfaces.d/lxc-net-bridge.cfg"
-    owner: "root"
-    group: "root"
-    mode: "0644"
-  tags:
-    - lxc-files
-    - lxc-net
-    - lxc-bridge
diff --git a/tasks/lxc_post_install.yml b/tasks/lxc_post_install.yml
index b4897016..9e4e4f99 100644
--- a/tasks/lxc_post_install.yml
+++ b/tasks/lxc_post_install.yml
@@ -34,7 +34,6 @@
     - { src: lxc-openstack.conf.j2, dest: "/etc/lxc/lxc-openstack.conf" }
     - { src: lxc.default.j2, dest: "/etc/default/lxc-net", mode: "0644" }
     - { src: lxc-system-manage.j2, dest: "/usr/local/bin/lxc-system-manage", mode: "0755" }
-    - { src: manual-init.override.j2, dest: "/etc/init/lxc-net.override" }
   tags:
     - lxc-files
     - lxc-config
diff --git a/tasks/lxc_pre_install.yml b/tasks/lxc_pre_install.yml
index d1b1bead..9689cd0a 100644
--- a/tasks/lxc_pre_install.yml
+++ b/tasks/lxc_pre_install.yml
@@ -32,3 +32,14 @@
     - "{{ lxc_container_cache_path }}"
   tags:
     - lxc-directories
+
+- name: Drop lxc-net override file
+  template:
+    src: manual-init.override.j2
+    dest: /etc/init/lxc-net.override
+    owner: root
+    group: root
+    mode: 0644
+  tags:
+    - lxc-files
+    - lxc-config
diff --git a/tests/files/expected-lxc-net-bridge.cfg b/tests/files/expected-lxc-net-bridge.cfg
index cd2e53a5..4b7cb59d 100644
--- a/tests/files/expected-lxc-net-bridge.cfg
+++ b/tests/files/expected-lxc-net-bridge.cfg
@@ -1,6 +1,6 @@
 auto lxcbr0
 iface lxcbr0 inet static
-    address 10.0.3.1
+    address 10.100.100.1
     netmask 255.255.255.0
     # dnsmasq start and stop
     post-up /usr/local/bin/lxc-system-manage iptables-create
diff --git a/tests/test.yml b/tests/test.yml
index 62773730..04470bce 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -33,6 +33,7 @@
         lxc_container_ssh_key: key_get.stdout
   roles:
     - role: "{{ rolename | basename }}"
+      lxc_net_address: 10.100.100.1
       lxc_net_bridge: lxcbr0
       lxc_kernel_options:
         - { key: 'fs.inotify.max_user_instances', value: 1024 }
@@ -71,6 +72,10 @@
       shell: |
         cat files/expected-lxc-net-bridge.cfg
       register: expected_interface_file
+    - name: Get bridge interface facts
+      setup:
+        filter: ansible_lxcbr0
+      register: lxcbr0_facts
     - name: Check role functions
       assert:
         that:
@@ -79,3 +84,4 @@
           - "container_cache_dir.stat.isdir"
           - "container_tar_file.stat.exists"
           - "interface_file.stdout | match(expected_interface_file.stdout)"
+          - "lxcbr0_facts.ansible_facts.ansible_lxcbr0.ipv4.address | match('10.100.100.1')"