diff --git a/k8s/docker-mos-rally b/k8s/docker-mos-rally
new file mode 100644
index 0000000..67a0f8f
--- /dev/null
+++ b/k8s/docker-mos-rally
@@ -0,0 +1,14 @@
+FROM xrally/xrally-openstack:2.1.0 
+
+MAINTAINER Alex Savatieiev (a.savex@gmail.com)
+
+WORKDIR /rally
+RUN sudo apt-get update && \
+    sudo apt-get install -y wget curl git
+
+RUN git clone https://github.com/Mirantis/rally-plugins.git && \
+    cd rally-plugins/ && \
+    pip3 install .
+
+ENTRYPOINT ["bash"]
+
diff --git a/k8s/docker-mos-toolset-full b/k8s/docker-mos-toolset-full
index b9a2c28..1313803 100644
--- a/k8s/docker-mos-toolset-full
+++ b/k8s/docker-mos-toolset-full
@@ -18,6 +18,12 @@
     ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone && \
     apt-get install -y python3-pip python3-venv vim git iperf3 mtr htop iputils-ping traceroute tcpdump wget iproute2 curl screen qemu-utils
 
+RUN curl https://baltocdn.com/helm/signing.asc | apt-key add - && \
+    apt-get install apt-transport-https --yes && \
+    echo "deb https://baltocdn.com/helm/stable/debian/ all main" | tee /etc/apt/sources.list.d/helm-stable-debian.list && \
+    apt-get update && \
+    apt-get install -y helm
+
 RUN pip3 install --no-cache-dir python-openstackclient python-neutronclient python-heatclient pyghmi python-octaviaclient tempestparser python-ironicclient aodhclient gnocchiclient python-barbicanclient python-glanceclient
 
 RUN git clone https://gerrit.mcp.mirantis.com/mcp/cvp-configuration /opt/res-files && \
@@ -44,7 +50,7 @@
 
 RUN mkdir /opt/packages/ && \
     cd /opt/packages && \
-    apt-get download $(apt-cache depends --recurse --no-recommends --no-suggests --no-conflicts --no-breaks --no-replaces --no-enhances iperf3 | grep "^\w" | sort -u) || true
+    apt-get download $(apt-cache depends --recurse --no-recommends --no-suggests --no-conflicts --no-breaks --no-replaces --no-enhances iperf3 fio | grep "^\w" | sort -u) || true
 
 RUN curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" && \
     install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl && \
diff --git a/k8s/kubespec.yaml.sample b/k8s/rally-files/kubespec.yaml.sample
similarity index 100%
rename from k8s/kubespec.yaml.sample
rename to k8s/rally-files/kubespec.yaml.sample
diff --git a/k8s/si-tests-offline.sh b/k8s/si-files/si-tests-offline.sh
similarity index 100%
rename from k8s/si-tests-offline.sh
rename to k8s/si-files/si-tests-offline.sh
diff --git a/k8s/list-docker-images.yaml b/k8s/yamls/list-docker-images.yaml
similarity index 100%
rename from k8s/list-docker-images.yaml
rename to k8s/yamls/list-docker-images.yaml
diff --git a/k8s/qa-daemonset.yaml b/k8s/yamls/qa-daemonset.yaml
similarity index 100%
rename from k8s/qa-daemonset.yaml
rename to k8s/yamls/qa-daemonset.yaml
diff --git a/k8s/qa-rally.yaml b/k8s/yamls/qa-rally.yaml
similarity index 100%
rename from k8s/qa-rally.yaml
rename to k8s/yamls/qa-rally.yaml
diff --git a/k8s/qa-res.yaml b/k8s/yamls/qa-res.yaml
similarity index 100%
rename from k8s/qa-res.yaml
rename to k8s/yamls/qa-res.yaml
diff --git a/k8s/qa-ubuntu.yaml b/k8s/yamls/qa-ubuntu.yaml
similarity index 100%
rename from k8s/qa-ubuntu.yaml
rename to k8s/yamls/qa-ubuntu.yaml
diff --git a/k8s/toolset.yaml b/k8s/yamls/toolset.yaml
similarity index 100%
rename from k8s/toolset.yaml
rename to k8s/yamls/toolset.yaml