diff --git a/CHANGELOG.md b/CHANGELOG.md
index d3ebbacbb2..4af2ea0f02 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -47,7 +47,7 @@
 * RPP - [1.2.0](https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp/releases/tag/1.2.0)
 * FFMPEG - [n4.4.2](https://github.com/FFmpeg/FFmpeg/releases/tag/n4.4.2)
 * Dependencies for all the above packages
-* MIVisionX Setup Script - `V2.5.4`
+* MIVisionX Setup Script - `V2.5.5`
 
 ### Known issues
 
diff --git a/MIVisionX-setup.py b/MIVisionX-setup.py
index 96375a23fc..84c43dfe61 100644
--- a/MIVisionX-setup.py
+++ b/MIVisionX-setup.py
@@ -30,7 +30,7 @@
 __author__ = "Kiriti Nagesh Gowda"
 __copyright__ = "Copyright 2018 - 2023, AMD ROCm MIVisionX"
 __license__ = "MIT"
-__version__ = "2.5.4"
+__version__ = "2.5.5"
 __maintainer__ = "Kiriti Nagesh Gowda"
 __email__ = "mivisionx.support@amd.com"
 __status__ = "Shipping"
@@ -502,7 +502,7 @@
             os.system('sudo '+linuxFlag+' '+linuxSystemInstall +
                       ' '+linuxSystemInstall_check+' install -y git g++ hipblas hipsparse rocrand hipfft rocfft rocthrust-devel hipcub-devel python3-devel')
         os.system('sudo -v')
-        os.system('(cd '+deps_dir+'; git clone https://github.com/ROCmSoftwarePlatform/cupy.git; export CUPY_INSTALL_USE_HIP=1; export ROCM_HOME=/opt/rocm; cd cupy; git submodule update --init; pip install -e . --no-cache-dir -vvvv)')
+        os.system('(cd '+deps_dir+'; git clone -b v12.2.0 https://github.com/ROCmSoftwarePlatform/cupy.git; export CUPY_INSTALL_USE_HIP=1; export ROCM_HOME=/opt/rocm; cd cupy; git submodule update --init; pip install -e . --no-cache-dir -vvvv)')
         os.system('pip install numpy==1.21')
 
     # Install ffmpeg
diff --git a/README.md b/README.md
index a520bf19bc..e4cb9d0bcc 100644
--- a/README.md
+++ b/README.md
@@ -441,7 +441,7 @@ Review all notable [changes](CHANGELOG.md#changelog) with the latest release
 * RPP - [1.2.0](https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp/releases/tag/1.2.0)
 * FFMPEG - [n4.4.2](https://github.com/FFmpeg/FFmpeg/releases/tag/n4.4.2)
 * Dependencies for all the above packages
-* MIVisionX Setup Script - `V2.5.4`
+* MIVisionX Setup Script - `V2.5.5`
 
 ### Known issues
 
diff --git a/docker/mivisionx-on-ubuntu20.dockerfile b/docker/mivisionx-on-ubuntu20.dockerfile
index 7b606e47f8..8568ce0eb9 100644
--- a/docker/mivisionx-on-ubuntu20.dockerfile
+++ b/docker/mivisionx-on-ubuntu20.dockerfile
@@ -55,9 +55,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install git g++ python3 python3-pi
 ENV CUPY_INSTALL_USE_HIP=1
 ENV ROCM_HOME=/opt/rocm
 RUN DEBIAN_FRONTEND=noninteractive apt-get -y install git g++ hipblas hipsparse rocrand hipfft rocfft rocthrust-dev hipcub-dev python3 python3-pip python3-dev && \
-        git clone https://github.com/ROCmSoftwarePlatform/cupy.git
-        # CuPy requires Python 3.9+ to build - U20 supports 3.8.10
-        #git submodule update --init && pip install -e . --no-cache-dir -vvvv && pip install numpy==1.21 && cd
+        git clone -b v12.2.0 https://github.com/ROCmSoftwarePlatform/cupy.git && \
+        git submodule update --init && pip install -e . --no-cache-dir -vvvv && pip install numpy==1.21 && cd
 
 ENV MIVISIONX_WORKSPACE=/workspace
 WORKDIR $MIVISIONX_WORKSPACE
diff --git a/docker/mivisionx-on-ubuntu22.dockerfile b/docker/mivisionx-on-ubuntu22.dockerfile
index 0035bbf800..644d3e29ea 100644
--- a/docker/mivisionx-on-ubuntu22.dockerfile
+++ b/docker/mivisionx-on-ubuntu22.dockerfile
@@ -60,7 +60,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install python3 python3-pip git g+
         cmake ../ && make -j4 && sudo make install && cd ../../ && \
         pip install pytest==3.1 && git clone -b v2.10.4 https://github.com/pybind/pybind11 && cd pybind11 && mkdir build && cd build && \
         cmake -DDOWNLOAD_CATCH=ON -DDOWNLOAD_EIGEN=ON ../ && make -j4 && sudo make install && cd ../../ && \
-        git clone https://github.com/ROCmSoftwarePlatform/cupy.git && cd cupy && git submodule update --init && \
+        git clone -b v12.2.0 https://github.com/ROCmSoftwarePlatform/cupy.git && cd cupy && git submodule update --init && \
         pip install -e . --no-cache-dir -vvvv && pip install numpy==1.21
 
 ENV MIVISIONX_WORKSPACE=/workspace
diff --git a/docker/pytorch/mivisionx-with-pytorch-with-mesa.dockerfile b/docker/pytorch/mivisionx-with-pytorch-with-mesa.dockerfile
index e274399c1a..95e4f97e86 100644
--- a/docker/pytorch/mivisionx-with-pytorch-with-mesa.dockerfile
+++ b/docker/pytorch/mivisionx-with-pytorch-with-mesa.dockerfile
@@ -61,7 +61,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install git g++ hipblas hipsparse
         cmake ../ && make -j4 && sudo make install && cd ../../ && \
         pip install pytest==3.1 && git clone -b v2.10.4 https://github.com/pybind/pybind11 && cd pybind11 && mkdir build && cd build && \
         cmake -DDOWNLOAD_CATCH=ON -DDOWNLOAD_EIGEN=ON ../ && make -j4 && sudo make install && cd ../../ && \
-        git clone https://github.com/ROCmSoftwarePlatform/cupy.git && cd cupy && git submodule update --init && \
+        git clone -b v12.2.0 https://github.com/ROCmSoftwarePlatform/cupy.git && cd cupy && git submodule update --init && \
         pip install -e . --no-cache-dir -vvvv && pip install numpy==1.21 && cd
 
 ENV MIVISIONX_WORKSPACE=/workspace
diff --git a/docker/pytorch/mivisionx-with-pytorch.dockerfile b/docker/pytorch/mivisionx-with-pytorch.dockerfile
index 8dd9a2eccc..3a3ed5d21c 100644
--- a/docker/pytorch/mivisionx-with-pytorch.dockerfile
+++ b/docker/pytorch/mivisionx-with-pytorch.dockerfile
@@ -47,7 +47,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install git g++ hipblas hipsparse
         cmake ../ && make -j4 && sudo make install && cd ../../ && \
         pip install pytest==3.1 && git clone -b v2.10.4 https://github.com/pybind/pybind11 && cd pybind11 && mkdir build && cd build && \
         cmake -DDOWNLOAD_CATCH=ON -DDOWNLOAD_EIGEN=ON ../ && make -j4 && sudo make install && cd ../../ && \
-        git clone https://github.com/ROCmSoftwarePlatform/cupy.git && cd cupy && git submodule update --init && \
+        git clone -b v12.2.0 https://github.com/ROCmSoftwarePlatform/cupy.git && cd cupy && git submodule update --init && \
         pip install -e . --no-cache-dir -vvvv && pip install numpy==1.21 && cd
 
 ENV MIVISIONX_WORKSPACE=/workspace
diff --git a/docker/tensorflow/mivisionx-with-tensorflow.dockerfile b/docker/tensorflow/mivisionx-with-tensorflow.dockerfile
index efce8f37b0..ae12792699 100644
--- a/docker/tensorflow/mivisionx-with-tensorflow.dockerfile
+++ b/docker/tensorflow/mivisionx-with-tensorflow.dockerfile
@@ -52,7 +52,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install git g++ hipblas hipsparse
         cmake ../ && make -j4 && sudo make install && cd ../../ && \
         pip install pytest==3.1 && git clone -b v2.10.4 https://github.com/pybind/pybind11 && cd pybind11 && mkdir build && cd build && \
         cmake -DDOWNLOAD_CATCH=ON -DDOWNLOAD_EIGEN=ON ../ && make -j4 && sudo make install && cd ../../ && \
-        git clone https://github.com/ROCmSoftwarePlatform/cupy.git && cd cupy && git submodule update --init && \
+        git clone -b v12.2.0 https://github.com/ROCmSoftwarePlatform/cupy.git && cd cupy && git submodule update --init && \
         pip install -e . --no-cache-dir -vvvv && pip install numpy==1.21 && cd
 
 WORKDIR /workspace
diff --git a/docker/ubuntu20/level-5.dockerfile b/docker/ubuntu20/level-5.dockerfile
index 7b606e47f8..8568ce0eb9 100644
--- a/docker/ubuntu20/level-5.dockerfile
+++ b/docker/ubuntu20/level-5.dockerfile
@@ -55,9 +55,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install git g++ python3 python3-pi
 ENV CUPY_INSTALL_USE_HIP=1
 ENV ROCM_HOME=/opt/rocm
 RUN DEBIAN_FRONTEND=noninteractive apt-get -y install git g++ hipblas hipsparse rocrand hipfft rocfft rocthrust-dev hipcub-dev python3 python3-pip python3-dev && \
-        git clone https://github.com/ROCmSoftwarePlatform/cupy.git
-        # CuPy requires Python 3.9+ to build - U20 supports 3.8.10
-        #git submodule update --init && pip install -e . --no-cache-dir -vvvv && pip install numpy==1.21 && cd
+        git clone -b v12.2.0 https://github.com/ROCmSoftwarePlatform/cupy.git && \
+        git submodule update --init && pip install -e . --no-cache-dir -vvvv && pip install numpy==1.21 && cd
 
 ENV MIVISIONX_WORKSPACE=/workspace
 WORKDIR $MIVISIONX_WORKSPACE
diff --git a/docker/ubuntu22/level-5.dockerfile b/docker/ubuntu22/level-5.dockerfile
index c195495277..9c8be9c868 100644
--- a/docker/ubuntu22/level-5.dockerfile
+++ b/docker/ubuntu22/level-5.dockerfile
@@ -60,7 +60,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install git g++ hipblas hipsparse
         cmake ../ && make -j4 && sudo make install && cd ../../ && \
         pip install pytest==3.1 && git clone -b v2.10.4 https://github.com/pybind/pybind11 && cd pybind11 && mkdir build && cd build && \
         cmake -DDOWNLOAD_CATCH=ON -DDOWNLOAD_EIGEN=ON ../ && make -j4 && sudo make install && cd ../../ && \
-        git clone https://github.com/ROCmSoftwarePlatform/cupy.git && cd cupy && git submodule update --init && \
+        git clone -b v12.2.0 https://github.com/ROCmSoftwarePlatform/cupy.git && cd cupy && git submodule update --init && \
         pip install -e . --no-cache-dir -vvvv && pip install numpy==1.21
 
 ENV MIVISIONX_WORKSPACE=/workspace