diff --git a/Dockerfile b/Dockerfile
index 22f9bb19560d25d23b711ad5b593152e8de288d9..b4280b2d6239b34fb306744343a668eb71a9abe9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -98,7 +98,7 @@ RUN cd tensorflow \
 ### OTB
 
 ARG GUI=false
-ARG OTB=5086d7601d80f2427f4d4d7f2398ec46e7efa300
+ARG OTB=8.1.2
 ARG OTBTESTS=false
 
 RUN mkdir /src/otb
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
index 8cf33b828df91d39c0943f3d4b6b67b490b3f505..219aa15b5c276a007b884bde976a27828dae4580 100644
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@@ -2,6 +2,7 @@ Version 4.2.1 (5 oct 2023)
 ----------------------------------------------------------------
 * Fix a bug occuring when input images origins were not sharing the same pixel grid
 * CI to push "latest-gpu" tag on dockerhub
+* Move to OTB 8.2.1
 
 Version 4.2.0 (12 sep 2023)
 ----------------------------------------------------------------
diff --git a/doc/docker_use.md b/doc/docker_use.md
index 378626c372abfd0fc7c6c87be556750e16ad19a2..1194b35e415fa0b0c618e47325d061d23fcca915 100644
--- a/doc/docker_use.md
+++ b/doc/docker_use.md
@@ -25,12 +25,12 @@ Since OTBTF >= 3.2.1 you can find the latest docker images on
 
 | Name                                                                               | Os            | TF    | OTB   | Description            | Dev files | Compute capability |
 |------------------------------------------------------------------------------------| ------------- |-------|-------| ---------------------- | --------- | ------------------ |
-| **mdl4eo/otbtf:4.2.1-cpu**                                                         | Ubuntu Jammy  | r2.12 | 8.1.0 | CPU, no optimization   | no        | 5.2,6.1,7.0,7.5,8.6|
-| **mdl4eo/otbtf:4.2.1-cpu-dev**                                                     | Ubuntu Jammy  | r2.12 | 8.1.0 | CPU, no optimization (dev) |  yes  | 5.2,6.1,7.0,7.5,8.6|
-| **mdl4eo/otbtf:4.2.1-gpu**                                                         | Ubuntu Jammy  | r2.12 | 8.1.0 | GPU, no optimization   | no        | 5.2,6.1,7.0,7.5,8.6|
-| **mdl4eo/otbtf:4.2.1-gpu-dev**                                                     | Ubuntu Jammy  | r2.12 | 8.1.0 | GPU, no optimization (dev) | yes   | 5.2,6.1,7.0,7.5,8.6|
-| **gitlab.irstea.fr/remi.cresson/otbtf/container_registry/otbtf:4.2.1-gpu-opt**     | Ubuntu Jammy  | r2.12 | 8.1.0 | GPU with opt.          | no        | 5.2,6.1,7.0,7.5,8.6|
-| **gitlab.irstea.fr/remi.cresson/otbtf/container_registry/otbtf:4.2.1-gpu-opt-dev** | Ubuntu Jammy  | r2.12 | 8.1.0 | GPU with opt. (dev)    | yes       | 5.2,6.1,7.0,7.5,8.6|
+| **mdl4eo/otbtf:4.2.1-cpu**                                                         | Ubuntu Jammy  | r2.12 | 8.1.2 | CPU, no optimization   | no        | 5.2,6.1,7.0,7.5,8.6|
+| **mdl4eo/otbtf:4.2.1-cpu-dev**                                                     | Ubuntu Jammy  | r2.12 | 8.1.2 | CPU, no optimization (dev) |  yes  | 5.2,6.1,7.0,7.5,8.6|
+| **mdl4eo/otbtf:4.2.1-gpu**                                                         | Ubuntu Jammy  | r2.12 | 8.1.2 | GPU, no optimization   | no        | 5.2,6.1,7.0,7.5,8.6|
+| **mdl4eo/otbtf:4.2.1-gpu-dev**                                                     | Ubuntu Jammy  | r2.12 | 8.1.2 | GPU, no optimization (dev) | yes   | 5.2,6.1,7.0,7.5,8.6|
+| **gitlab.irstea.fr/remi.cresson/otbtf/container_registry/otbtf:4.2.1-gpu-opt**     | Ubuntu Jammy  | r2.12 | 8.1.2 | GPU with opt.          | no        | 5.2,6.1,7.0,7.5,8.6|
+| **gitlab.irstea.fr/remi.cresson/otbtf/container_registry/otbtf:4.2.1-gpu-opt-dev** | Ubuntu Jammy  | r2.12 | 8.1.2 | GPU with opt. (dev)    | yes       | 5.2,6.1,7.0,7.5,8.6|
 
 The list of older releases is available [here](#older-images).
 
diff --git a/tools/docker/build-flags-otb.txt b/tools/docker/build-flags-otb.txt
index 95b8462cbc851ebf38c4b3a0c85d1e5b22f5e594..f72d7c7b2bb1bec6dfa6ffc9cc2991c87263e87e 100644
--- a/tools/docker/build-flags-otb.txt
+++ b/tools/docker/build-flags-otb.txt
@@ -17,3 +17,12 @@
 -DUSE_SYSTEM_TINYXML=ON
 -DUSE_SYSTEM_ZLIB=ON
 -DUSE_SYSTEM_SWIG=ON
+
+-DOTB_USE_QT=OFF
+-DOTB_USE_OPENGL=OFF
+-DOTB_USE_GLUT=OFF
+-DOTB_USE_GLEW=OFF
+-DOTB_USE_GLFW=OFF
+
+-DGDAL_SB_EXTRA_OPTIONS=--with-geos
+