diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..87b1145
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,4 @@
+[submodule "stacklight-pytest"]
+	path = test_set/cvp-stacklight
+	url = ssh://mcp-ci-gerrit@gerrit.mcp.mirantis.com:29418/mcp/stacklight-pytest
+	branch = release/2019.2.0
diff --git a/Dockerfile b/Dockerfile
index e92f9cb..a61bf23 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,8 @@
+# syntax=docker/dockerfile:1.0.0-experimental
 FROM ubuntu:20.04
 
 LABEL maintainer="dev@mirantis.com"
-LABEL build_date="2022-08-03"
+LABEL build_date="2023-05-10"
 
 ENV DEBIAN_FRONTEND=noninteractive \
     DEBCONF_NONINTERACTIVE_SEEN=true \
@@ -12,41 +13,35 @@
 
 USER root
 ARG UBUNTU_MIRROR_URL="http://archive.ubuntu.com/ubuntu"
-ARG SL_TEST_REPO='http://gerrit.mcp.mirantis.com/mcp/stacklight-pytest'
-ARG SL_TEST_BRANCH='release/2019.2.0'
 ENV PYTHONHTTPSVERIFY=0
 
 WORKDIR /var/lib/
 COPY bin/ /usr/local/bin/
 COPY test_set/ ./
-
-RUN set -exo pipefail; pushd /etc/apt/ && echo > sources.list && \
+ 
+RUN set -exo pipefail; \
+    pushd /etc/apt/ && echo > sources.list && \
     echo 'Acquire::Languages "none";' > apt.conf.d/docker-no-languages && \
     echo 'Acquire::GzipIndexes "true"; Acquire::CompressionTypes::Order:: "gz";' > apt.conf.d/docker-gzip-indexes && \
     echo 'APT::Get::Install-Recommends "false"; APT::Get::Install-Suggests "false";' > apt.conf.d/docker-recommends && \
     echo "deb [arch=amd64] $UBUNTU_MIRROR_URL focal main restricted universe multiverse" >> sources.list && \
     echo "deb [arch=amd64] $UBUNTU_MIRROR_URL focal-updates main restricted universe multiverse" >> sources.list && \
     echo "deb [arch=amd64] $UBUNTU_MIRROR_URL focal-backports main restricted universe multiverse" >> sources.list && \
-    popd ; apt-get update && apt-get  upgrade -y && \
+    popd ;
+RUN apt-get update && apt-get  upgrade -y && \
     apt-get install -y build-essential curl git-core iputils-ping libffi-dev libldap2-dev libsasl2-dev libssl-dev patch vim-tiny wget \
-    virtualenv python2.7 python2.7-dev python3.8 python3.8-dev python3-pip  \
+    python2.7 python2.7-dev python3.8 python3.8-dev python3-pip  \
 # Due to upstream bug we should use fixed version of pip
     && pip3 install -U pip==20.0.2  \
-    && pip3 install tox  \
+    && pip3 install tox==3.25.1 virtualenv==20.21.0
     # initialize cvp stacklight test suite
-        && mkdir cvp-stacklight \
-        && pushd cvp-stacklight  \
-        && git clone -b $SL_TEST_BRANCH $SL_TEST_REPO  \
-        && pushd stacklight-pytest \
-        && git log -n1 \
-        && popd && popd  \
-        && tox --recreate \
+RUN tox --recreate \
 # Cleanup
     && apt-get -y purge libx11-data xauth libxmuu1 libxcb1 libx11-6 libxext6 ppp pppconfig pppoeconf popularity-contest cpp gcc g++ libssl-doc && \
     apt-get -y autoremove; apt-get -y clean ; rm -rf /root/.cache; rm -rf /var/lib/apt/lists/* && \
     rm -rf /tmp/* ; rm -rf /var/tmp/* ; rm -rfv /etc/apt/sources.list.d/* ; echo > /etc/apt/sources.list \
 # Download iperf package
-    && wget http://ftp.br.debian.org/debian/pool/main/i/iperf/iperf_2.0.5+dfsg1-2_amd64.deb -O /var/lib/iperf_2.0.5+dfsg1-2_amd64.deb
+    && wget http://ftp.br.debian.org/debian/pool/main/i/iperf/iperf_2.0.14a+dfsg1-1_amd64.deb -O /var/lib/iperf.deb
 
 ENTRYPOINT ["entrypoint.sh"]
 # docker build --no-cache -t cvp-sanity-checks:test_latest .
diff --git a/pre-build.sh b/pre-build.sh
new file mode 100755
index 0000000..02afe80
--- /dev/null
+++ b/pre-build.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+set -x
+echo "Start pre-build"
+# export GIT_SSH_COMMAND="${GIT_SSH_COMMAND} -A"
+export GIT_SSH_COMMAND="ssh -A"
+echo $SSH_AUTH_SOCK
+git submodule init
+git submodule update --remote
\ No newline at end of file
diff --git a/test_set/cvp-sanity/requirements.txt b/test_set/cvp-sanity/requirements.txt
index 71160cc..b0980b8 100644
--- a/test_set/cvp-sanity/requirements.txt
+++ b/test_set/cvp-sanity/requirements.txt
@@ -7,4 +7,4 @@
 pygerrit2>=2.0.9
 GitPython>=3.1.7
 ldap3>=2.7
-
+urllib3==1.26.12
\ No newline at end of file
diff --git a/test_set/cvp-spt/requirements.txt b/test_set/cvp-spt/requirements.txt
index fc145c8..375d62e 100644
--- a/test_set/cvp-spt/requirements.txt
+++ b/test_set/cvp-spt/requirements.txt
@@ -1,12 +1,87 @@
-paramiko==2.7.2 # LGPLv2.1+
-pytest==4.6.11 # MIT
+appdirs==1.4.4
+atomicwrites==1.4.1
+attrs==21.4.0
+Babel==2.9.1
+backports.functools-lru-cache==1.6.4
+bcrypt==3.1.7
+certifi==2021.10.8
+cffi==1.15.1
+chardet==4.0.0
+cliff==2.18.0
+cmd2==0.8.9
+configparser==4.0.2
+contextlib2==0.6.0.post1
+cryptography==3.3.2
+debtcollector==1.22.0
+decorator==4.4.2
+dogpile.cache==0.9.2
+enum34==1.1.10
+funcsigs==1.0.2
+functools32==3.2.3.post2
+futures==3.4.0
+idna==2.10
+importlib-metadata==2.1.3
+importlib-resources==3.3.1
+ipaddress==1.0.23
+iso8601==0.1.16
+jmespath==0.10.0
+jsonpatch==1.32
+jsonpointer==2.3
+jsonschema==3.2.0
+keystoneauth1==5.0.0
+monotonic==1.6
+more-itertools==5.0.0
 msgpack==1.0.3
-python-cinderclient==6.0.0 # Apache-2.0
-python-glanceclient==3.0.0  # Apache-2.0
-python-keystoneclient==3.22.0  # Apache-2.0
-python-neutronclient==7.1.0 # Apache-2.0
+munch==2.5.0
+netaddr==0.8.0
+netifaces==0.11.0
+openstacksdk==0.45.0
+os-client-config==2.1.0
+os-service-types==1.7.0
+osc-lib==2.0.0
+oslo.config==7.0.0
+oslo.context==2.23.1
+oslo.i18n==3.25.1
+oslo.log==3.45.2
+oslo.serialization==2.29.3
+oslo.utils==3.42.1
+packaging==20.9
+paramiko==2.7.2
+pathlib2==2.3.7.post1
+pbr==5.11.1
+pluggy==0.13.1
+prettytable==0.7.2
+py==1.11.0
+pycparser==2.21
+pyinotify==0.9.6
+PyNaCl==1.4.0
+pyOpenSSL==21.0.0
+pyparsing==2.4.7
+pyperclip==1.8.2
+pyrsistent==0.16.1
+pytest==4.6.11
+python-cinderclient==6.0.0
+python-dateutil==2.8.2
+python-glanceclient==3.0.0
+python-keystoneclient==3.22.0
+python-neutronclient==7.1.0
 python-novaclient==7.1.0
-PyYAML>=5.4  # MIT
-requests==2.27.1 # Apache-2.0
+pytz==2023.3
+PyYAML==5.4.1
+requests==2.27.1
+requestsexceptions==1.4.0
+rfc3986==1.5.0
+scandir==1.10.0
+simplejson==3.19.1
+singledispatch==3.7.0
+six==1.16.0
+stevedore==1.32.0
+subprocess32==3.5.4
 texttable==1.2.0
+typing==3.10.0.0
+unicodecsv==0.14.1
 urllib3==1.26.11
+warlock==1.3.3
+wcwidth==0.2.6
+wrapt==1.15.0
+zipp==1.2.0
diff --git a/test_set/cvp-spt/utils/ssh.py b/test_set/cvp-spt/utils/ssh.py
index dec9ba3..c051fff 100644
--- a/test_set/cvp-spt/utils/ssh.py
+++ b/test_set/cvp-spt/utils/ssh.py
@@ -141,10 +141,10 @@
         internet_at_vms = utils.get_configuration().get("internet_at_vms")
         if internet_at_vms.lower() == 'false':
             logger.debug("Using downloaded iperf package")
-            transport.put_file("/var/lib/iperf_2.0.5+dfsg1-2_amd64.deb",
-                               "/home/ubuntu/iperf_2.0.5+dfsg1-2_amd64.deb")
+            transport.put_file("/var/lib/iperf.deb",
+                               "/home/ubuntu/iperf.deb")
             transport.exec_command(
-                'sudo dpkg -i /home/ubuntu/iperf_2.0.5+dfsg1-2_amd64.deb')
+                'sudo dpkg -i /home/ubuntu/iperf.deb')
         else:
             logger.debug("Installing iperf using apt")
             transport.exec_command(
diff --git a/test_set/cvp-stacklight b/test_set/cvp-stacklight
new file mode 160000
index 0000000..05dd724
--- /dev/null
+++ b/test_set/cvp-stacklight
@@ -0,0 +1 @@
+Subproject commit 05dd724cea7e0fde290eeb70a0f88e41a4d10a24
diff --git a/test_set/tox.ini b/test_set/tox.ini
index dee7131..41069b3 100644
--- a/test_set/tox.ini
+++ b/test_set/tox.ini
@@ -2,6 +2,7 @@
 envlist = cvp-sanity,cvp-spt,cvp-stacklight
 skipsdist = TRUE
 deps = pip==20.0.2
+       virtualenv==20.21.0
        setuptools
        wheel
 
@@ -15,12 +16,12 @@
 changedir = cvp-sanity
 
 [testenv:cvp-spt]
-basepython = python2.7
+basepython=python2.7
 deps = -rcvp-spt/requirements.txt
 changedir = cvp-spt
 
 [testenv:cvp-stacklight]
-basepython = python2.7
-install_command = python -m pip install cvp-stacklight/stacklight-pytest {packages}
-deps = -rcvp-stacklight/stacklight-pytest/requirements.txt
+basepython=python2.7
+install_command = python -m pip install cvp-stacklight/ {packages}
+deps = -rcvp-stacklight/requirements.txt
 changedir = cvp-stacklight