diff --git a/sonic-slave-buster/Dockerfile.j2 b/sonic-slave-buster/Dockerfile.j2
index 7a970679a..b5d4ac901 100644
--- a/sonic-slave-buster/Dockerfile.j2
+++ b/sonic-slave-buster/Dockerfile.j2
@@ -303,8 +303,6 @@ RUN apt-get update && apt-get install -y \
         libevent-dev \
 # For libyang
         swig \
-# For SWI Tools
-        python-m2crypto \
 # For build dtb
         device-tree-compiler \
 # For sonic-mgmt-framework
@@ -444,5 +442,8 @@ RUN apt-get install -y docker-ce=5:18.09.5~3-0~debian-buster docker-ce-cli=5:18.
 RUN echo "DOCKER_OPTS=\"--experimental --storage-driver=vfs\"" >> /etc/default/docker
 RUN update-alternatives --set iptables /usr/sbin/iptables-legacy
 
+# Install m2crypto package, needed by SWI tools
+RUN pip2 install m2crypto==0.36.0
+
 # Install swi tools
 RUN pip2 install git+https://github.com/aristanetworks/swi-tools.git@d51761ec0bb93c73039233f3c01ed48235ffad00
diff --git a/sonic-slave-jessie/Dockerfile.j2 b/sonic-slave-jessie/Dockerfile.j2
index ae5bd2b14..2914deb78 100644
--- a/sonic-slave-jessie/Dockerfile.j2
+++ b/sonic-slave-jessie/Dockerfile.j2
@@ -357,5 +357,8 @@ RUN echo "deb [arch={{ CONFIGURED_ARCH }}] http://archive.debian.org/debian jess
 RUN apt-get -o Acquire::Check-Valid-Until=false update
 RUN apt-get -y -o Acquire::Check-Valid-Until=false install ca-certificates-java=20161107~bpo8+1 openjdk-8-jdk
 
+# Install m2crypto package, needed by SWI tools
+RUN pip install m2crypto==0.36.0
+
 # Install swi tools
 RUN python -m pip install git+https://github.com/aristanetworks/swi-tools.git@d51761ec0bb93c73039233f3c01ed48235ffad00
diff --git a/sonic-slave-stretch/Dockerfile.j2 b/sonic-slave-stretch/Dockerfile.j2
index 59a7044f3..75230d291 100644
--- a/sonic-slave-stretch/Dockerfile.j2
+++ b/sonic-slave-stretch/Dockerfile.j2
@@ -290,8 +290,6 @@ RUN apt-get update && apt-get install -y \
         libevent-dev \
 # For libyang
         swig \
-# For SWI Tools
-        python-m2crypto \
 # For sonic-mgmt-framework
         autoconf \
         m4 \
@@ -438,5 +436,8 @@ RUN apt-get install -y docker-ce=18.06.3~ce~3-0~debian
 {%- endif %}
 RUN echo "DOCKER_OPTS=\"--experimental --storage-driver=vfs\"" >> /etc/default/docker
 
+# Install m2crypto package, needed by SWI tools
+RUN pip install m2crypto==0.36.0
+
 # Install swi tools
 RUN pip2 install git+https://github.com/aristanetworks/swi-tools.git@d51761ec0bb93c73039233f3c01ed48235ffad00