diff --git a/Makefile b/Makefile
index c983726..a477d21 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-all: preautomation provision swarm_deploy
+all: preautomation provision swarm_deploy fix
 
 preautomation:
 	/bin/bash ./ansible_install.sh
@@ -9,5 +9,8 @@ provision:
 swarm_deploy:
 	/bin/bash ./ansible_swarm_config.sh
 
+fix:
+	/bin/bash ./environment_bnode_script.sh
+
 clean:
 	/bin/bash ./clean.sh
diff --git a/roles/lxc_swarm/tasks/deploy.yml b/roles/lxc_swarm/tasks/deploy.yml
index 873f345..b268a47 100644
--- a/roles/lxc_swarm/tasks/deploy.yml
+++ b/roles/lxc_swarm/tasks/deploy.yml
@@ -13,16 +13,16 @@
 #- pause:
 #    seconds: 30
 
-- name: Update swarm stack service "bnode" with proper environmental variables
-  shell: |
-    sleep 60; mcontainer_addr=`ssh root@10.0.3.100 "docker ps|xargs -n1|grep -i NAMES -A 1|tail -1"`
-    MASTER_ADDR=`ssh -t root@10.0.3.100 "docker exec -it $mcontainer_addr ip a s|grep -i 10.0|head -1 2>/dev/null" 2>&1 |grep inet|awk '{print $2}'|cut -d "/" -f 1|tr -d ' '`
-    [ -z $MASTER_ADDR ] && echo "Node 1 hasn't yet been initialized"
-    env MASTER_ADDR="${MASTER_ADDR}" docker stack deploy -c stack.yaml stack
+#- name: Update swarm stack service "bnode" with proper environmental variables
+#  shell: |
+#    sleep 60; mcontainer_addr=`ssh root@10.0.3.100 "docker ps|xargs -n1|grep -i NAMES -A 1|tail -1"`
+#    MASTER_ADDR=`ssh -t root@10.0.3.100 "docker exec -it $mcontainer_addr ip a s|grep -i 10.0|head -1 2>/dev/null" 2>&1 |grep inet|awk '{print $2}'|cut -d "/" -f 1|tr -d ' '`
+#    [ -z $MASTER_ADDR ] && echo "Node 1 hasn't yet been initialized"
+#    env MASTER_ADDR="${MASTER_ADDR}" docker stack deploy -c stack.yaml stack
 #    env MASTER_ADDR="${MASTER_ADDR}" docker service scale stack_bnode=1
 #    sleep 30
-  args:
-    executable: /bin/bash
+#  args:
+#    executable: /bin/bash
 
 #- name: Wait for nodes[0] container to start
 #  pause:
diff --git a/roles/lxc_swarm/tasks/lxc_nodes.yml b/roles/lxc_swarm/tasks/lxc_nodes.yml
index 1fccfe3..ddcae9c 100644
--- a/roles/lxc_swarm/tasks/lxc_nodes.yml
+++ b/roles/lxc_swarm/tasks/lxc_nodes.yml
@@ -54,3 +54,7 @@
     direction: in
     from_ip: "10.0.3.0/24"
   when: inventory_hostname in groups['manager']   
+
+- name: Enable LXC inter-container communication
+  shell: ifconfig eth0 hw ether 00:00:03:12:22:11
+  when: inventory_hostname in groups['workers'][1]