diff --git a/scripts/bootstrap_k8s.sh b/scripts/bootstrap_kubernetes.sh
similarity index 82%
rename from scripts/bootstrap_k8s.sh
rename to scripts/bootstrap_kubernetes.sh
index b9c4aac..63c5112 100755
--- a/scripts/bootstrap_k8s.sh
+++ b/scripts/bootstrap_kubernetes.sh
@@ -5,4 +5,4 @@
 "$CWD"/fuel_config_verify.sh
 "$CWD"/fuel_infra_install.sh
 "$CWD"/docker_swarm.sh
-"$CWD"/k8s.sh
+"$CWD"/kubernetes_install.sh
diff --git a/scripts/k8s.sh b/scripts/k8s.sh
deleted file mode 100755
index bcf57d9..0000000
--- a/scripts/k8s.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash -x
-exec > >(tee -i /tmp/"$(basename "$0" .sh)"_"$(date '+%Y-%m-%d_%H-%M-%S')".log) 2>&1
-
-# Create and distribute SSL certificates for services using salt state
-salt "*" state.sls salt
-
-# Install keepalived
-salt -C 'I@keepalived:cluster' state.sls keepalived -b 1
-
-# Install haproxy
-salt -C 'I@haproxy:proxy' state.sls haproxy
-salt -C 'I@haproxy:proxy' service.status haproxy
-
-# Install docker
-salt -C 'I@docker:host' state.sls docker.host
-salt -C 'I@docker:host' cmd.run "docker ps"
-
-# Install etcd
-salt -C 'I@etcd:server' state.sls etcd.server.service
-salt -C 'I@etcd:server' cmd.run "etcdctl cluster-health"
-
-# Install Kubernetes and Calico
-salt -C 'I@kubernetes:master' state.sls kubernetes.master.kube-addons
-salt -C 'I@kubernetes:pool' state.sls kubernetes.pool
-salt -C 'I@kubernetes:pool' cmd.run "calicoctl node status"
-salt -C 'I@kubernetes:pool' cmd.run "calicoctl get ippool"
-
-# Setup NAT for Calico
-salt -C 'I@kubernetes:master' state.sls etcd.server.setup
-
-# Run whole master to check consistency
-salt -C 'I@kubernetes:master' state.sls kubernetes exclude=kubernetes.master.setup
-
-# Register addons
-salt -C 'I@kubernetes:master' --subset 1 state.sls kubernetes.master.setup
-
-# Nginx needs to be configured
-salt -C 'I@nginx:server' state.sls nginx
diff --git a/scripts/kubernetes_install.sh b/scripts/kubernetes_install.sh
new file mode 100755
index 0000000..c1b35c1
--- /dev/null
+++ b/scripts/kubernetes_install.sh
@@ -0,0 +1,39 @@
+#!/bin/bash -xe
+exec > >(tee -i /tmp/"$(basename "$0" .sh)"_"$(date '+%Y-%m-%d_%H-%M-%S')".log) 2>&1
+
+# Create and distribute SSL certificates for services using salt state
+salt --state-output=terse '*' state.sls salt
+
+# Install keepalived
+salt --state-output=terse -C 'I@keepalived:cluster' state.sls keepalived -b 1
+
+# Install haproxy
+salt --state-output=terse -C 'I@haproxy:proxy' state.sls haproxy
+salt --state-output=terse -C 'I@haproxy:proxy' service.status haproxy
+
+# Install docker
+salt --state-output=terse -C 'I@docker:host' state.sls docker.host
+salt --state-output=terse -C 'I@docker:host' cmd.run "docker ps"
+
+# Install etcd
+salt --state-output=terse -C 'I@etcd:server' state.sls etcd.server.service
+salt --state-output=terse -C 'I@etcd:server' cmd.run ". /var/lib/etcd/configenv && etcdctl cluster-health"
+
+# Install Kubernetes and Calico
+salt --state-output=terse -C 'I@kubernetes:master' state.sls kubernetes.master.kube-addons
+salt --state-output=terse -C 'I@kubernetes:pool' state.sls kubernetes.pool
+salt --state-output=terse -C 'I@kubernetes:pool' cmd.run "calicoctl node status"
+salt --state-output=terse -C 'I@kubernetes:pool' cmd.run "calicoctl get ippool"
+
+# Setup NAT for Calico
+salt --state-output=terse -C 'I@kubernetes:master' --subset 1 state.sls etcd.server.setup
+
+# Run whole master to check consistency
+salt --state-output=terse -C 'I@kubernetes:master' state.sls kubernetes exclude=kubernetes.master.setup
+
+# Register addons
+salt --state-output=terse -C 'I@kubernetes:master' --subset 1 state.sls kubernetes.master.setup
+
+# Nginx needs to be configured
+#salt --state-output=terse -C 'I@nginx:server' state.sls nginx
+# IMHO not related to k8s installation