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 b195157b7c..37ec12aea4 100644
--- a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh
+++ b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh
@@ -17,6 +17,10 @@ fi
 atomic install --storage ostree --system --system-package=no --name=kube-apiserver ${_prefix}kubernetes-apiserver:${KUBE_TAG}
 atomic install --storage ostree --system --system-package=no --name=kube-controller-manager ${_prefix}kubernetes-controller-manager:${KUBE_TAG}
 atomic install --storage ostree --system --system-package=no --name=kube-scheduler ${_prefix}kubernetes-scheduler:${KUBE_TAG}
+if [ "$NETWORK_DRIVER" = "flannel" ]; then
+    atomic install --storage ostree --system --system-package=no \
+    --name=flanneld ${_prefix}flannel:${FLANNEL_TAG}
+fi
 
 sed -i '
     /^KUBE_ALLOW_PRIV=/ s/=.*/="--allow-privileged='"$KUBE_ALLOW_PRIV"'"/
diff --git a/magnum/drivers/common/templates/kubernetes/fragments/network-config-service.sh b/magnum/drivers/common/templates/kubernetes/fragments/network-config-service.sh
index 32e21c9617..bbf7a11ab2 100644
--- a/magnum/drivers/common/templates/kubernetes/fragments/network-config-service.sh
+++ b/magnum/drivers/common/templates/kubernetes/fragments/network-config-service.sh
@@ -67,3 +67,7 @@ chmod 0644 $FLANNEL_CONFIG_SERVICE
 
 systemctl enable flannel-config
 systemctl start --no-block flannel-config
+
+echo "activating service flanneld"
+systemctl enable flanneld
+systemctl start --no-block flanneld
diff --git a/magnum/drivers/common/templates/kubernetes/fragments/write-heat-params-master.yaml b/magnum/drivers/common/templates/kubernetes/fragments/write-heat-params-master.yaml
index 1a7d067dc4..a3f38cebdf 100644
--- a/magnum/drivers/common/templates/kubernetes/fragments/write-heat-params-master.yaml
+++ b/magnum/drivers/common/templates/kubernetes/fragments/write-heat-params-master.yaml
@@ -42,6 +42,7 @@ write_files:
       WAIT_CURL="$WAIT_CURL"
       KUBE_TAG="$KUBE_TAG"
       ETCD_TAG="$ETCD_TAG"
+      FLANNEL_TAG="$FLANNEL_TAG"
       KUBE_VERSION="$KUBE_VERSION"
       KUBE_DASHBOARD_VERSION="$KUBE_DASHBOARD_VERSION"
       TRUSTEE_USER_ID="$TRUSTEE_USER_ID"
diff --git a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml
index 8d339532e5..9a3d6deb11 100644
--- a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml
+++ b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml
@@ -648,6 +648,7 @@ resources:
           kube_tag: {get_param: kube_tag}
           kube_version: {get_param: kube_version}
           etcd_tag: {get_param: etcd_tag}
+          flannel_tag: {get_param: flannel_tag}
           kube_dashboard_version: {get_param: kube_dashboard_version}
           trustee_user_id: {get_param: trustee_user_id}
           trustee_password: {get_param: trustee_password}
diff --git a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml
index f72f04f107..63684e76ed 100644
--- a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml
+++ b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml
@@ -219,6 +219,10 @@ parameters:
     type: string
     description: tag of the etcd system container
 
+  flannel_tag:
+    type: string
+    description: tag of the flannel system containers
+
   kube_version:
     type: string
     description: version of kubernetes used for kubernetes cluster
@@ -424,6 +428,7 @@ resources:
             "$NO_PROXY": {get_param: no_proxy}
             "$KUBE_TAG": {get_param: kube_tag}
             "$ETCD_TAG": {get_param: etcd_tag}
+            "$FLANNEL_TAG": {get_param: flannel_tag}
             "$KUBE_VERSION": {get_param: kube_version}
             "$KUBE_DASHBOARD_VERSION": {get_param: kube_dashboard_version}
             "$WAIT_CURL": {get_attr: [master_wait_handle, curl_cli]}