diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0a4d646a95ba9bf3cae8b93687b0a72522060dc3..ec8905bde1336ddb28a2a126fa4c44e448d66641 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,6 +2,7 @@ project(OTBTensorflow)
 
 # Use Tensorflow, or not
 option(OTB_USE_TENSORFLOW "Enable Tensorflow dependent applications" OFF)
+set(CMAKE_CXX_STANDARD 17)
 
 if(OTB_USE_TENSORFLOW)
   message("Tensorflow support enabled")
diff --git a/Dockerfile b/Dockerfile
index 904431e35349f5a27f35250e834594f5baa3f4d5..7a4bac9e3a684b9f485332a6fb789f1dafe0954a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -104,20 +104,7 @@ RUN apt-get update -y \
  && git clone https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb.git \
  && cd otb && git checkout $OTB
 
-# <---------------------------------------- Begin dirty hack
-# This is a dirty hack for release 4.0.0alpha
-# We have to wait that OTB moves from C++14 to C++17
-# See https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/-/issues/2338
-RUN cd /src/otb/otb \
- && sed -i 's/CMAKE_CXX_STANDARD 14/CMAKE_CXX_STANDARD 17/g' CMakeLists.txt \
- && echo "" > Modules/Core/ImageManipulation/test/CMakeLists.txt \
- && echo "" > Modules/Core/Conversion/test/CMakeLists.txt \
- && echo "" > Modules/Core/Indices/test/CMakeLists.txt \
- && echo "" > Modules/Core/Edge/test/CMakeLists.txt \
- && echo "" > Modules/Core/ImageBase/test/CMakeLists.txt \
- && echo "" > Modules/Learning/DempsterShafer/test/CMakeLists.txt \
-# <---------------------------------------- End dirty hack
- && cd .. \
+RUN cd /src/otb/ \
  && mkdir -p build \
  && cd build \
  && if $OTBTESTS; then \
diff --git a/setup.py b/setup.py
index 8519fb1132c1f889eb2edb6853132ff08c747538..0c147fe9420d10210722672556353c7883811d9f 100644
--- a/setup.py
+++ b/setup.py
@@ -32,4 +32,10 @@ setuptools.setup(
               "deep learning",
               "machine learning"
               ],
+    install_requires=[
+        "deprecated",
+        "tensorflow",
+        "numpy",
+        "tqdm",
+    ]
 )