diff --git a/k8s/docker-rally-2.1.0 b/k8s/docker-rally-2.1.0
index 845a3c3..c0996d1 100644
--- a/k8s/docker-rally-2.1.0
+++ b/k8s/docker-rally-2.1.0
@@ -2,21 +2,20 @@
 
 MAINTAINER Alex Savatieiev (a.savex@gmail.com)
 
-WORKDIR /opt
-RUN git clone https://gerrit.mcp.mirantis.com/mcp/cvp-configuration /opt/res-files && \
+WORKDIR /rally
+RUN sudo apt update && \
+    sudo apt -y install curl wget vim
+
+RUN git clone https://gerrit.mcp.mirantis.com/mcp/cvp-configuration /rally/res-files && \
     rally db recreate && \
-    rally env create --from-sysenv --name openstack && \
-    rally env check && \
-    git clone https://github.com/Mirantis/rally-plugins.git /opt/rally-plugins && \
-    cd /opt/rally-plugins/ && \
+    git clone https://github.com/Mirantis/rally-plugins.git /rally/rally-plugins && \
+    cd /rally/rally-plugins/ && \
     pip3 install . && \
     rally plugin list | grep kubernetes && \
-    rm -rf /var/lib/apt/lists/* && \
-    rm -rf /opt/res-files/.git && \
-    rm -rf /opt/cfg-checker/.git
+    rm -rf /rally/res-files/.git
 
 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 && \
+    sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl && \
     rm kubectl
 
 ENTRYPOINT ["sleep infinite"]
diff --git a/k8s/docker_images.yaml b/k8s/list-docker-images.yaml
similarity index 100%
rename from k8s/docker_images.yaml
rename to k8s/list-docker-images.yaml
diff --git a/k8s/rally-files/init-rally-openstack.sh b/k8s/rally-files/init-rally-openstack.sh
new file mode 100644
index 0000000..7f640a5
--- /dev/null
+++ b/k8s/rally-files/init-rally-openstack.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+cd /artifacts
+
+# Create openstack env
+rally env create --from-sysenv --name openstack
+rally env check