diff --git a/k8s/docker-ubuntu-2004 b/k8s/docker-ubuntu-2004
index 998ae15..5a1200d 100644
--- a/k8s/docker-ubuntu-2004
+++ b/k8s/docker-ubuntu-2004
@@ -12,12 +12,15 @@
     make && \
     make install && \
     cd /opt && \
-    rm -rf /opt/fio && \
-    export TZ="America/Chicago" && \
+    rm -rf /opt/fio
+
+RUN export TZ="America/Chicago" && \
     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 && \
-    pip3 install --no-cache-dir python-openstackclient python-neutronclient python-heatclient pyghmi python-octaviaclient tempestparser && \
-    git clone https://gerrit.mcp.mirantis.com/mcp/cvp-configuration /opt/res-files && \
+    apt-get install -y python3-pip python3-venv vim git iperf3 mtr htop iputils-ping traceroute tcpdump wget iproute2 curl screen
+
+RUN pip3 install --no-cache-dir python-openstackclient python-neutronclient python-heatclient pyghmi python-octaviaclient tempestparser python-ironicclient aodhclient gnocchiclient
+
+RUN git clone https://gerrit.mcp.mirantis.com/mcp/cvp-configuration /opt/res-files && \
     git clone http://gerrit.mcp.mirantis.com/mcp/cfg-checker /opt/cfg-checker && \
     cd /opt/cfg-checker && \
     python3 -m venv .checkervenv && \
@@ -29,16 +32,20 @@
     cp /opt/res-files/scripts/prepare.sh ./ && \
     cp /opt/res-files/scripts/cmp_check.sh ./ && \
     cp /opt/res-files/cleanup.sh ./ && \
-    cd /opt/si-tests/ && \
-    python3 -m venv .venv && \
-    . .venv/bin/activate && \
-    pip3 install --no-cache-dir -r si_tests/requirements.txt && \
-    deactivate && \
-    cd /opt && \
-    rm -rf /var/lib/apt/lists/* && \
     rm -rf /opt/res-files/.git && \
     rm -rf /opt/cfg-checker/.git
 
+RUN cd /opt/si-tests/ && \
+    python3 -m venv .sivenv && \
+    . .sivenv/bin/activate && \
+    pip3 install --no-cache-dir -r si_tests/requirements.txt && \
+    deactivate && \
+    cd /opt
+
+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
+
 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 && \
     rm kubectl