diff --git a/Dockerfile b/Dockerfile
index da634cea3fb7dbbce68b3660b9900e2d60a0d837..990c55f597646eaa17ea7b23c33bbf82442a8bc3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -85,7 +85,7 @@ RUN git clone --single-branch -b $TF https://github.com/tensorflow/tensorflow.gi
 
 ### OTB
 ARG GUI=false
-ARG OTB=7.4.0
+ARG OTB=8.0.1
 ARG OTBTESTS=false
 
 RUN mkdir /src/otb
@@ -149,7 +149,7 @@ COPY --from=builder /src /src
 # System-wide ENV
 ENV PATH="/opt/otbtf/bin:$PATH"
 ENV LD_LIBRARY_PATH="/opt/otbtf/lib:$LD_LIBRARY_PATH"
-ENV PYTHONPATH="/opt/otbtf/lib/python3/site-packages:/opt/otbtf/lib/otb/python:/src/otbtf"
+ENV PYTHONPATH="/opt/otbtf/lib/python3/site-packages:/opt/otbtf/lib/python3/dist-packages:/opt/otbtf/lib/otb/python:/src/otbtf"
 ENV OTB_APPLICATION_PATH="/opt/otbtf/lib/otb/applications"
 
 # Default user, directory and command (bash is the entrypoint when using 'docker create')
diff --git a/app/otbPatchesSelection.cxx b/app/otbPatchesSelection.cxx
index 68d76221dbf6b7ffbb828a751420a854d58864a7..3437849b55419d6d9c0e9038e24c94506201ca8d 100644
--- a/app/otbPatchesSelection.cxx
+++ b/app/otbPatchesSelection.cxx
@@ -35,6 +35,12 @@
 #include <random>
 #include <limits>
 
+namespace otb
+{
+
+namespace Wrapper
+{
+
 // Functor to retrieve nodata
 template<class TPixel, class OutputPixel>
 class IsNoData
@@ -62,12 +68,6 @@ private:
   typename TPixel::ValueType m_NoDataValue;
 };
 
-namespace otb
-{
-
-namespace Wrapper
-{
-
 class PatchesSelection : public Application
 {
 public:
diff --git a/tools/docker/build-deps-cli.txt b/tools/docker/build-deps-cli.txt
index 5d699cb19db6cd4845acaa909f50e148a172e318..ffd72911c2ef56105a24e0c83f764aa9af4d7540 100644
--- a/tools/docker/build-deps-cli.txt
+++ b/tools/docker/build-deps-cli.txt
@@ -25,8 +25,6 @@ wget
 zip
 
 bison
-gdal-bin
-python3-gdal
 libboost-date-time-dev
 libboost-filesystem-dev
 libboost-graph-dev
@@ -36,8 +34,6 @@ libboost-thread-dev
 libcurl4-gnutls-dev
 libexpat1-dev
 libfftw3-dev
-libgdal-dev
-libgeotiff-dev
 libgsl-dev
 libinsighttoolkit4-dev
 libkml-dev
@@ -45,9 +41,6 @@ libmuparser-dev
 libmuparserx-dev
 libopencv-core-dev
 libopencv-ml-dev
-libopenthreads-dev
-libossim-dev
-libpng-dev
 libsvm-dev
 libtinyxml-dev
 zlib1g-dev
diff --git a/tools/docker/build-flags-otb.txt b/tools/docker/build-flags-otb.txt
index 2c3e0feac4e480cd9f8a0c9969b70c301761e8da..56b0434c4000cf0e3bbe43310ebba63a1eedbcbe 100644
--- a/tools/docker/build-flags-otb.txt
+++ b/tools/docker/build-flags-otb.txt
@@ -3,9 +3,9 @@
 -DUSE_SYSTEM_EXPAT=ON
 -DUSE_SYSTEM_FFTW=ON
 -DUSE_SYSTEM_FREETYPE=ON
--DUSE_SYSTEM_GDAL=ON
+-DUSE_SYSTEM_GDAL=OFF
 -DUSE_SYSTEM_GEOS=ON
--DUSE_SYSTEM_GEOTIFF=ON
+-DUSE_SYSTEM_GEOTIFF=OFF
 -DUSE_SYSTEM_GLEW=ON
 -DUSE_SYSTEM_GLFW=ON
 -DUSE_SYSTEM_GLUT=ON