diff --git a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh
index 9c5d2f53a1..fd07eb83f0 100644
--- a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh
+++ b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh
@@ -1,6 +1,9 @@
-#!/bin/sh -x
+#!/bin/bash
 
+set +x
 . /etc/sysconfig/heat-params
+set -x
+set -e
 
 echo "configuring kubernetes (master)"
 
@@ -39,6 +42,8 @@ unmanaged-devices=interface-name:cali*;interface-name:tunl*
 EOF
 }
         systemctl restart NetworkManager
+        echo "net.ipv4.conf.all.rp_filter = 1" >> /etc/sysctl.conf
+        $ssh_cmd sysctl -p
     fi
 fi
 
diff --git a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh
index 43f41f2a79..04a29ebf86 100644
--- a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh
+++ b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 set +x
 . /etc/sysconfig/heat-params
 set -x
+set -e
 
 ssh_cmd="ssh -F /srv/magnum/.ssh/config root@localhost"
 
@@ -41,6 +42,8 @@ unmanaged-devices=interface-name:cali*;interface-name:tunl*
 EOF
 }
         $ssh_cmd systemctl restart NetworkManager
+        echo "net.ipv4.conf.all.rp_filter = 1" >> /etc/sysctl.conf
+        $ssh_cmd sysctl -p
     fi
 fi