diff --git a/etc/example._env b/etc/example._env
index 1a8c472..80e4a72 100644
--- a/etc/example._env
+++ b/etc/example._env
@@ -6,18 +6,22 @@
 # Or run it from within a cloud
 
 # Main log file of the tests
-LOGFILE = 'cfg_checker.log'
+MCP_LOGFILE = 'cfg_checker.log'
 
 # SSH is used when environment is not local to get salt password
 # in order set options and user for the ssh, 
 # please, use ~/.ssh/config
 # SSH hostname of salt master node
-SSH_KEY=<ssh_keyfile_path>
-SSH_USER=<ssh_user>
-SSH_HOST=<ssh_hostname>
+MCP_SSH_KEY=<ssh_keyfile_path>
+MCP_SSH_USER=<ssh_user>
+MCP_SSH_HOST=<ssh_hostname>
+
+
+### Salt type section
+# All vars should start with SALT
 
 # Salt master host to connect to
-SALT_URL=127.0.0.1
+MCP_ENV_HOST=127.0.0.1
 
 # Salt master port.
 # Note that you can safely execute second master (not on production)
@@ -38,3 +42,7 @@
 
 # All nodes list file overide
 SALT_NODE_LIST_FILE=etc/example._list
+
+### K8s section
+# All vars start with KUBE
+KUBE_CONFIG_ROOT=/root
\ No newline at end of file
diff --git a/etc/local.env b/etc/local.env
index 4fab668..bf55206 100644
--- a/etc/local.env
+++ b/etc/local.env
@@ -2,15 +2,18 @@
 # Local Environment file
 
 # Main log file of the tests
-LOGFILE = '/var/log/salt-cfg-checker.log'
+MCP_LOGFILE = '/var/log/salt-cfg-checker.log'
 
 # Salt master host to connect to
-SALT_URL=127.0.0.1
-
+MCP_ENV_HOST=127.0.0.1
 # Salt master port.
 # Note that you can safely execute second master (not on production)
 # on the same cfg node with diferent port and set logging to ALL
-SALT_PORT=6969
+MCP_SALT_PORT=6969
+
+
+### Salt type section
+# All vars should start with SALT
 
 # User and password to auth on master. Can be found in /srv/salt/...
 # No need for a password if environment is local
@@ -29,3 +32,10 @@
 # Can be set to 'auto' for automatic collection
 # or check the example in 'etc/example._list'
 SALT_NODE_LIST_FILE=auto
+
+### K8s section
+# All vars start with KUBE
+KUBE_CONFIG_ROOT=/root
+KUBE_SCRIPTS_FOLDER=cfg-checker-scripts
+KUBE_NODE_USER=ubuntu
+KUBE_NODE_KEYPATH=/home/ubuntu/node_key.rsa
\ No newline at end of file
diff --git a/etc/qa-lab.env b/etc/qa-lab.env
index 259528b..3d785ef 100644
--- a/etc/qa-lab.env
+++ b/etc/qa-lab.env
@@ -6,23 +6,22 @@
 # Or run it from within a cloud
 
 # Main log file of the tests
-LOGFILE = 'qa-lab.log'
+MCP_LOGFILE = 'qa-lab.log'
 
 # SSH is used when environment is not local to get salt password
 # in order set options and user for the ssh, 
 # please, use ~/.ssh/config
 # SSH hostname of salt master node
-SSH_KEY=/Users/savex/.ssh/id_rsa
-SSH_USER=osavatieiev
-SSH_HOST=172.16.242.122
+MCP_SSH_KEY=/Users/savex/.ssh/id_rsa
+MCP_SSH_USER=osavatieiev
+MCP_SSH_HOST=172.16.242.122
 
 # Salt master host to connect to
-SALT_URL=172.16.242.122
-
+MCP_ENV_HOST=172.16.242.122
 # Salt master port.
 # Note that you can safely execute second master (not on production)
 # on the same cfg node with diferent port and set logging to ALL
-SALT_PORT=6969
+MCP_SALT_PORT=6969
 
 # User and password to auth on master. Can be found in /srv/salt/...
 SALT_USER=salt