diff --git a/roles/network_plugin/tasks/calico.yml b/roles/network_plugin/tasks/calico.yml
index aefc3c80f47bb1d7d9a04b5885f0b8ed7694947d..f7042bf5090da97041fdf4c0171971c340336e0a 100644
--- a/roles/network_plugin/tasks/calico.yml
+++ b/roles/network_plugin/tasks/calico.yml
@@ -15,12 +15,6 @@
     - reload systemd
     - restart calico-node
 
-- name: Calico | Write network-environment
-  template: src=calico/network-environment.j2 dest=/etc/network-environment mode=u+x
-  notify: 
-    - reload systemd
-    - restart calico-node
-
 - name: Calico | Enable calico-node
   service: name=calico-node enabled=yes state=started
 
diff --git a/roles/network_plugin/tasks/main.yml b/roles/network_plugin/tasks/main.yml
index e64e58f123c03e78a9c4411e0545caccc6ed1288..4b6c8c66a6ca018b89f405405d1200a43d664a0d 100644
--- a/roles/network_plugin/tasks/main.yml
+++ b/roles/network_plugin/tasks/main.yml
@@ -6,8 +6,12 @@
 
 - include: flannel.yml
   when: kube_network_plugin == "flannel"
+
+- name: Calico | Write network-environment
+  template: src=calico/network-environment.j2 dest=/etc/network-environment mode=u+x
+  when: kube_network_plugin == "calico"
+
 - include: calico.yml
   when: kube_network_plugin == "calico"
 
 - meta: flush_handlers
-