diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a5f9c03a5..a87b8fa052 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,11 +6,12 @@
 
 [MIVisionX Documentation](https://gpuopen-professionalcompute-libraries.github.io/MIVisionX/)
 
-## MIVisionX 2.5.0 (Unreleased)
+## MIVisionX 2.5.0
 
 ### Added
 
 * CTest - OpenVX Tests
+* Hardware Support
 
 ### Optimizations
 
@@ -22,6 +23,8 @@
   + PyBind11
   + RapidJSON
 * Setup Updates
+* RPP Version - 1.2.0
+* Dockerfiles - Updates & bugfix
 
 ### Fixed
 
@@ -34,17 +37,17 @@
   + Ubuntu - `20.04` / `22.04`
   + CentOS - `7` / `8`
   + RHEL - `8` / `9`
-  + SLES - `15-SP3`
+  + SLES - `15-SP4`
 * ROCm: rocm-core - `5.4.3.50403-121`
 * miopen-hip - `2.19.0.50403-121`
 * miopen-opencl - `2.18.0.50300-63`
 * migraphx - `2.4.0.50403-121`
 * Protobuf - [V3.12.4](https://github.com/protocolbuffers/protobuf/releases/tag/v3.12.4)
 * OpenCV - [4.6.0](https://github.com/opencv/opencv/releases/tag/4.6.0)
-* RPP - [1.0.0](https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp/releases/tag/1.0.0)
+* 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.1`
+* MIVisionX Setup Script - `V2.5.3`
 
 ### Known issues
 
diff --git a/MIVisionX-setup.py b/MIVisionX-setup.py
index df719ef1ef..cc522383b4 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.1"
+__version__ = "2.5.3"
 __maintainer__ = "Kiriti Nagesh Gowda"
 __email__ = "mivisionx.support@amd.com"
 __status__ = "Shipping"
@@ -43,8 +43,8 @@
                     help='OpenCV Version - optional (default:4.6.0)')
 parser.add_argument('--protobuf',  	type=str, default='3.12.4',
                     help='ProtoBuf Version - optional (default:3.12.4)')
-parser.add_argument('--rpp',   		type=str, default='1.1.0',
-                    help='RPP Version - optional (default:1.1.0)')
+parser.add_argument('--rpp',   		type=str, default='1.2.0',
+                    help='RPP Version - optional (default:1.2.0)')
 parser.add_argument('--pybind11',   type=str, default='v2.10.4',
                     help='PyBind11 Version - optional (default:v2.10.4)')
 parser.add_argument('--ffmpeg',    	type=str, default='ON',
@@ -435,6 +435,15 @@
 
     if rocalInstall == 'ON':
         # Install RPP
+        # clang
+        os.system('sudo -v')
+        os.system('sudo '+linuxFlag+' '+linuxSystemInstall+' ' +
+                      linuxSystemInstall_check+' install clang')
+        if "SLES" in platfromInfo:
+            os.system('sudo -v')
+            os.system('sudo update-alternatives --install /usr/bin/clang clang /opt/rocm-*/llvm/bin/clang 100')
+            os.system('sudo update-alternatives --install /usr/bin/clang++ clang++ /opt/rocm-*/llvm/bin/clang++ 100')
+        # OS Deps
         if "Ubuntu" in platfromInfo:
             # Install Packages for rocAL
             os.system('sudo -v')
@@ -444,10 +453,6 @@
             os.system('sudo -v')
             os.system('sudo '+linuxFlag+' '+linuxSystemInstall +
                       ' '+linuxSystemInstall_check+' install nasm yasm')
-            # clang
-            os.system('sudo -v')
-            os.system('sudo '+linuxFlag+' '+linuxSystemInstall+' ' +
-                      linuxSystemInstall_check+' install clang')
         elif "redhat" in platfromInfo or "SLES" in platfromInfo:
             # Nasm & Yasm
             os.system('sudo -v')
diff --git a/README.md b/README.md
index 00d05f4e70..527dae9187 100644
--- a/README.md
+++ b/README.md
@@ -164,7 +164,7 @@ MIVisionX provides you with tools for accomplishing your tasks throughout the wh
   + **Ubuntu** - `20.04` / `22.04`
   + **CentOS** - `7` / `8`
   + **RedHat** - `8` / `9`
-  + **SLES** - `15-SP3`
+  + **SLES** - `15-SP4`
 * Install [ROCm](https://docs.amd.com)
 * CMake 3.0 or later
 * ROCm MIOpen for `Neural Net Extensions` ([vx_nn](amd_openvx_extensions/amd_nn/README.md#openvx-neural-network-extension-library-vx_nn))
@@ -189,7 +189,7 @@ For the convenience of the developer, we provide the setup script `MIVisionX-set
   + Ubuntu - `20.04` / `22.04`
   + CentOS - `7` / `8`
   + RedHat - `8` / `9`
-  + SLES - `15-SP3`
+  + SLES - `15-SP4`
 * [ROCm supported hardware](https://docs.amd.com)
 * [ROCm](https://docs.amd.com)
 
@@ -455,17 +455,17 @@ Review all notable [changes](CHANGELOG.md#changelog) with the latest release
   + Ubuntu - `20.04` / `22.04`
   + CentOS - `7` / `8`
   + RHEL - `8` / `9`
-  + SLES - `15-SP3`
+  + SLES - `15-SP4`
 * ROCm: rocm-core - `5.4.3.50403-121`
 * miopen-hip - `2.19.0.50403-121`
 * miopen-opencl - `2.18.0.50300-63`
 * migraphx - `2.4.0.50403-121`
 * Protobuf - [V3.12.4](https://github.com/protocolbuffers/protobuf/releases/tag/v3.12.4)
 * OpenCV - [4.6.0](https://github.com/opencv/opencv/releases/tag/4.6.0)
-* RPP - [1.1.0](https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp/releases/tag/1.1.0)
+* 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.1`
+* MIVisionX Setup Script - `V2.5.3`
 
 ### Known issues
 
diff --git a/docker/archive/mivisionx-opencl-on-ubuntu20.dockerfile b/docker/archive/mivisionx-opencl-on-ubuntu20.dockerfile
index 450b28a15f..5d0b7dc149 100644
--- a/docker/archive/mivisionx-opencl-on-ubuntu20.dockerfile
+++ b/docker/archive/mivisionx-opencl-on-ubuntu20.dockerfile
@@ -39,7 +39,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install wget libbz2-dev libssl-dev
         sudo ./b2 install threading=multi link=shared --with-system --with-filesystem && \
         ./b2 stage -j16 threading=multi link=static cxxflags="-std=c++11 -fpic" cflags="-fpic" && \
         sudo ./b2 install threading=multi link=static --with-system --with-filesystem && cd ../ && \
-        git clone -b 1.1.0  https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
+        git clone -b 1.2.0  https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
         cmake -DBACKEND=OCL ../ && make -j4 && sudo make install && cd ../../ && \
         git clone -b v3.12.4 https://github.com/protocolbuffers/protobuf.git && cd protobuf && git submodule update --init --recursive && \
         ./autogen.sh && ./configure && make -j8 && make check -j8 && sudo make install && sudo ldconfig && cd
diff --git a/docker/linux/mivisionx-on-rhel-8.dockerfile b/docker/linux/mivisionx-on-rhel-8.dockerfile
index 22b3bb1943..53bcf4f831 100644
--- a/docker/linux/mivisionx-on-rhel-8.dockerfile
+++ b/docker/linux/mivisionx-on-rhel-8.dockerfile
@@ -31,7 +31,7 @@ RUN yum -y install sqlite-devel libtool && yum -y groupinstall 'Development Tool
     sudo ./b2 install threading=multi link=static --with-system --with-filesystem
 RUN git clone -b v3.21.9 https://github.com/protocolbuffers/protobuf.git && cd protobuf && git submodule update --init --recursive && \
         ./autogen.sh && ./configure && make -j8 && make check -j8 && sudo make install && sudo ldconfig && cd
-RUN git clone -b 1.1.0 https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
+RUN git clone -b 1.2.0 https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
         cmake -DBACKEND=HIP ../ && make -j4 && sudo make install && cd
 
 ENV MIVISIONX_WORKSPACE=/workspace
diff --git a/docker/linux/mivisionx-on-rhel-9.dockerfile b/docker/linux/mivisionx-on-rhel-9.dockerfile
index b122bd3ec9..cc65181152 100644
--- a/docker/linux/mivisionx-on-rhel-9.dockerfile
+++ b/docker/linux/mivisionx-on-rhel-9.dockerfile
@@ -31,7 +31,7 @@ RUN yum -y install sqlite-devel libtool && yum -y groupinstall 'Development Tool
     sudo ./b2 install threading=multi link=static --with-system --with-filesystem
 RUN git clone -b v3.21.9 https://github.com/protocolbuffers/protobuf.git && cd protobuf && git submodule update --init --recursive && \
         ./autogen.sh && ./configure && make -j8 && make check -j8 && sudo make install && sudo ldconfig && cd
-RUN git clone -b 1.1.0 https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
+RUN git clone -b 1.2.0 https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
         cmake -DBACKEND=HIP ../ && make -j4 && sudo make install && cd
 
 ENV MIVISIONX_WORKSPACE=/workspace
diff --git a/docker/linux/mivisionx-on-sles-15.dockerfile b/docker/linux/mivisionx-on-sles-15.dockerfile
index 435f70c14f..cc1e1d274a 100644
--- a/docker/linux/mivisionx-on-sles-15.dockerfile
+++ b/docker/linux/mivisionx-on-sles-15.dockerfile
@@ -25,7 +25,7 @@ RUN zypper -n install sqlite-devel libtool && zypper -n install -t pattern devel
     sudo ./b2 install threading=multi link=static --with-system --with-filesystem
 RUN git clone -b v3.21.9 https://github.com/protocolbuffers/protobuf.git && cd protobuf && git submodule update --init --recursive && \
         ./autogen.sh && ./configure && make -j8 && make check -j8 && sudo make install && sudo ldconfig && cd
-RUN git clone -b 1.1.0 https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
+RUN git clone -b 1.2.0 https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
         cmake -DBACKEND=HIP ../ && make -j4 && sudo make install && cd
 
 ENV MIVISIONX_WORKSPACE=/workspace
diff --git a/docker/mivisionx-on-ubuntu20.dockerfile b/docker/mivisionx-on-ubuntu20.dockerfile
index 907050b48a..9e44181d70 100644
--- a/docker/mivisionx-on-ubuntu20.dockerfile
+++ b/docker/mivisionx-on-ubuntu20.dockerfile
@@ -45,7 +45,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install wget libbz2-dev libssl-dev
         sudo ./b2 install threading=multi link=shared --with-system --with-filesystem && \
         ./b2 stage -j16 threading=multi link=static cxxflags="-std=c++11 -fpic" cflags="-fpic" && \
         sudo ./b2 install threading=multi link=static --with-system --with-filesystem && cd ../ && \
-        git clone -b 1.1.0 https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
+        git clone -b 1.2.0 https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
         cmake -DBACKEND=HIP ../ && make -j4 && sudo make install && cd ../../ && \
         git clone -b v3.12.4 https://github.com/protocolbuffers/protobuf.git && cd protobuf && git submodule update --init --recursive && \
         ./autogen.sh && ./configure && make -j8 && make check -j8 && sudo make install && sudo ldconfig && cd
diff --git a/docker/mivisionx-on-ubuntu22.dockerfile b/docker/mivisionx-on-ubuntu22.dockerfile
index 8157595d45..4563d1b4d5 100644
--- a/docker/mivisionx-on-ubuntu22.dockerfile
+++ b/docker/mivisionx-on-ubuntu22.dockerfile
@@ -53,7 +53,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install sqlite3 libsqlite3-dev lib
     sudo ./b2 install threading=multi link=static --with-system --with-filesystem
 RUN git clone -b v3.21.9 https://github.com/protocolbuffers/protobuf.git && cd protobuf && git submodule update --init --recursive && \
         ./autogen.sh && ./configure && make -j8 && make check -j8 && sudo make install && sudo ldconfig && cd
-RUN git clone -b 1.1.0  https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
+RUN git clone -b 1.2.0  https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
         cmake -DBACKEND=HIP ../ && make -j4 && sudo make install && cd
 RUN DEBIAN_FRONTEND=noninteractive apt-get -y install python3 python3-pip git g++ hipblas hipsparse rocrand hipfft rocfft rocthrust-dev hipcub-dev python3-dev && \
         git clone https://github.com/Tencent/rapidjson.git && cd rapidjson && mkdir build && cd build && \
diff --git a/docker/pytorch/mivisionx-with-pytorch-with-mesa.dockerfile b/docker/pytorch/mivisionx-with-pytorch-with-mesa.dockerfile
index 3493f6cad5..e274399c1a 100644
--- a/docker/pytorch/mivisionx-with-pytorch-with-mesa.dockerfile
+++ b/docker/pytorch/mivisionx-with-pytorch-with-mesa.dockerfile
@@ -52,7 +52,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install wget libbz2-dev libssl-dev
         sudo ./b2 install threading=multi link=shared --with-system --with-filesystem && \
         ./b2 stage -j16 threading=multi link=static cxxflags="-std=c++11 -fpic" cflags="-fpic" && \
         sudo ./b2 install threading=multi link=static --with-system --with-filesystem && cd ../ && \
-        git clone -b 1.1.0  https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
+        git clone -b 1.2.0  https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
         cmake -DBACKEND=HIP ../ && make -j4 && sudo make install && cd ../../ && \
         git clone -b v3.12.4 https://github.com/protocolbuffers/protobuf.git && cd protobuf && git submodule update --init --recursive && \
         ./autogen.sh && ./configure && make -j8 && make check -j8 && sudo make install && sudo ldconfig && cd
diff --git a/docker/pytorch/mivisionx-with-pytorch.dockerfile b/docker/pytorch/mivisionx-with-pytorch.dockerfile
index a92c2fbb11..8dd9a2eccc 100644
--- a/docker/pytorch/mivisionx-with-pytorch.dockerfile
+++ b/docker/pytorch/mivisionx-with-pytorch.dockerfile
@@ -38,7 +38,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install wget libbz2-dev libssl-dev
         sudo ./b2 install threading=multi link=shared --with-system --with-filesystem && \
         ./b2 stage -j16 threading=multi link=static cxxflags="-std=c++11 -fpic" cflags="-fpic" && \
         sudo ./b2 install threading=multi link=static --with-system --with-filesystem && cd ../ && \
-        git clone -b 1.1.0  https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
+        git clone -b 1.2.0  https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
         cmake -DBACKEND=HIP ../ && make -j4 && sudo make install && cd ../../ && \
         git clone -b v3.12.4 https://github.com/protocolbuffers/protobuf.git && cd protobuf && git submodule update --init --recursive && \
         ./autogen.sh && ./configure && make -j8 && make check -j8 && sudo make install && sudo ldconfig && cd
diff --git a/docker/tensorflow/mivisionx-with-tensorflow.dockerfile b/docker/tensorflow/mivisionx-with-tensorflow.dockerfile
index 0b7c538eb0..efce8f37b0 100644
--- a/docker/tensorflow/mivisionx-with-tensorflow.dockerfile
+++ b/docker/tensorflow/mivisionx-with-tensorflow.dockerfile
@@ -43,7 +43,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install wget libbz2-dev libssl-dev
         sudo ./b2 install threading=multi link=shared --with-system --with-filesystem && \
         ./b2 stage -j16 threading=multi link=static cxxflags="-std=c++11 -fpic" cflags="-fpic" && \
         sudo ./b2 install threading=multi link=static --with-system --with-filesystem && cd ../ && \
-        git clone -b 1.1.0 https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
+        git clone -b 1.2.0 https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
         cmake -DBACKEND=HIP ../ && make -j4 && sudo make install && cd ../../ && \
         git clone -b v3.12.4 https://github.com/protocolbuffers/protobuf.git && cd protobuf && git submodule update --init --recursive && \
         ./autogen.sh && ./configure && make -j8 && make check -j8 && sudo make install && sudo ldconfig && cd
diff --git a/docker/ubuntu20/level-5.dockerfile b/docker/ubuntu20/level-5.dockerfile
index 907050b48a..9e44181d70 100644
--- a/docker/ubuntu20/level-5.dockerfile
+++ b/docker/ubuntu20/level-5.dockerfile
@@ -45,7 +45,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install wget libbz2-dev libssl-dev
         sudo ./b2 install threading=multi link=shared --with-system --with-filesystem && \
         ./b2 stage -j16 threading=multi link=static cxxflags="-std=c++11 -fpic" cflags="-fpic" && \
         sudo ./b2 install threading=multi link=static --with-system --with-filesystem && cd ../ && \
-        git clone -b 1.1.0 https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
+        git clone -b 1.2.0 https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
         cmake -DBACKEND=HIP ../ && make -j4 && sudo make install && cd ../../ && \
         git clone -b v3.12.4 https://github.com/protocolbuffers/protobuf.git && cd protobuf && git submodule update --init --recursive && \
         ./autogen.sh && ./configure && make -j8 && make check -j8 && sudo make install && sudo ldconfig && cd
diff --git a/docker/ubuntu22/level-5.dockerfile b/docker/ubuntu22/level-5.dockerfile
index 1bbf89691d..aa7cc1d09f 100644
--- a/docker/ubuntu22/level-5.dockerfile
+++ b/docker/ubuntu22/level-5.dockerfile
@@ -53,7 +53,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install sqlite3 libsqlite3-dev lib
     sudo ./b2 install threading=multi link=static --with-system --with-filesystem
 RUN git clone -b v3.21.9 https://github.com/protocolbuffers/protobuf.git && cd protobuf && git submodule update --init --recursive && \
         ./autogen.sh && ./configure && make -j8 && make check -j8 && sudo make install && sudo ldconfig && cd
-RUN git clone -b 1.1.0  https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
+RUN git clone -b 1.2.0  https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
         cmake -DBACKEND=HIP ../ && make -j4 && sudo make install && cd
 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/Tencent/rapidjson.git && cd rapidjson && mkdir build && cd build && \
diff --git a/docs/.sphinx/requirements.in b/docs/.sphinx/requirements.in
index c7fc94f3ee..a4f5c6748b 100644
--- a/docs/.sphinx/requirements.in
+++ b/docs/.sphinx/requirements.in
@@ -1 +1 @@
-rocm-docs-core==0.16.0
+rocm-docs-core==0.18.4
diff --git a/docs/.sphinx/requirements.txt b/docs/.sphinx/requirements.txt
index e0e3e86b4f..9edd6b181b 100644
--- a/docs/.sphinx/requirements.txt
+++ b/docs/.sphinx/requirements.txt
@@ -50,8 +50,6 @@ jinja2==3.1.2
     # via
     #   myst-parser
     #   sphinx
-linkify-it-py==1.0.3
-    # via myst-parser
 markdown-it-py==2.2.0
     # via
     #   mdit-py-plugins
@@ -62,7 +60,7 @@ mdit-py-plugins==0.3.5
     # via myst-parser
 mdurl==0.1.2
     # via markdown-it-py
-myst-parser[linkify]==1.0.0
+myst-parser==1.0.0
     # via rocm-docs-core
 packaging==23.0
     # via
@@ -94,7 +92,7 @@ requests==2.31.0
     # via
     #   pygithub
     #   sphinx
-rocm-docs-core==0.16.0
+rocm-docs-core==0.18.4
     # via -r requirements.in
 smmap==5.0.0
     # via gitdb
@@ -137,8 +135,6 @@ sphinxcontrib-serializinghtml==1.1.5
     # via sphinx
 typing-extensions==4.5.0
     # via pydata-sphinx-theme
-uc-micro-py==1.0.1
-    # via linkify-it-py
 urllib3==1.26.15
     # via requests
 wrapt==1.15.0
diff --git a/docs/conf.py b/docs/conf.py
index 5be10c528b..35f3111fab 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -29,6 +29,9 @@
 import os
 from rocm_docs import ROCmDocs
 
+
+external_projects_current_project = "mivisionx"
+
 os.system('find ../ -name "*.md" > "docfiles.txt"')
 doc_files = open('docfiles.txt', 'r')
 lines = doc_files.readlines()
diff --git a/utilities/mv_deploy/mv_compile.cpp b/utilities/mv_deploy/mv_compile.cpp
index 7515625335..75f51486fc 100644
--- a/utilities/mv_deploy/mv_compile.cpp
+++ b/utilities/mv_deploy/mv_compile.cpp
@@ -30,9 +30,17 @@ THE SOFTWARE.
 #include <string>
 #include <sstream>
 #include <sys/stat.h>
-#include <filesystem>
 #include <unistd.h>
-
+#if __cplusplus >= 201703L && __has_include(<filesystem>)
+    #include <filesystem>
+    namespace fs = std::filesystem;
+#elif __has_include(<experimental/filesystem>)
+    #include <experimental/filesystem>
+    namespace fs = std::experimental::filesystem;
+#elif __has_include(<boost/filesystem.hpp>)
+    #include <boost/filesystem.hpp>
+    namespace fs = boost::filesystem;
+#endif
 // helper functions
 void info(const char * format, ...)
 {
@@ -85,7 +93,7 @@ static mv_status MIVID_API_CALL mvLoadUpdateAndCompileModelForBackend(mivid_back
         } else {
             printf("Env MIVISIONX_MODEL_COMPILER_PATH is not specified, using default %s\n", compiler_path.c_str());
         }
-        if (!std::filesystem::exists(model_name)) {
+        if (!fs::exists(model_name)) {
             error("model %s does not exist", model_name);
             return MV_FAILURE;
         }