diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml
index 7b2eceaf41..9b8a51c6ac 100644
--- a/.github/workflows/ci_cd.yml
+++ b/.github/workflows/ci_cd.yml
@@ -61,6 +61,16 @@ jobs:
           operating-system: ${{ matrix.os }}
           python-version: ${{ matrix.python-version }}
 
+  docker-style:
+    name: Docker Style Check
+    runs-on: ubuntu-latest
+    steps:
+      - name: PyAnsys documentation style checks
+        uses: ansys/actions/docker-style@v5
+        with:
+          directory: docker
+          recursive: true
+
 # =================================================================================================
 # vvvvvvvvvvvvvvvvvvvvvvvvvvvvvv    RUNNING ON SELF-HOSTED RUNNER    vvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
 # =================================================================================================
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index f3cc733294..4608b0178e 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -18,4 +18,5 @@
 * [Maxime Rey](https://github.com/MaxJPRey)
 * [Revathy Venugopal](https://github.com/Revathyvenugopal162)
 * [Riccardo Manno](https://github.com/rmanno91)
+* [Sebastien Morais](https://github.com/SMoraisAnsys)
 * [Umut Soysal](https://github.com/umutsoysal)
diff --git a/docker/Dockerfile.linux b/docker/linux/Dockerfile
similarity index 72%
rename from docker/Dockerfile.linux
rename to docker/linux/Dockerfile
index 37f5b2f5aa..f49cef5c0e 100644
--- a/docker/Dockerfile.linux
+++ b/docker/linux/Dockerfile
@@ -7,11 +7,17 @@ FROM mcr.microsoft.com/dotnet/aspnet:6.0
 WORKDIR /app
 
 # Install unzip
-RUN apt-get update && apt-get install -y unzip
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends unzip=6.0-26+deb11u1 && \
+    rm -rf /var/lib/apt/lists/*
 
 # Add the binary files from the latest release
 COPY linux-binaries.zip .
-RUN unzip -qq linux-binaries.zip -d . && rm linux-binaries.zip && chmod -R 0755 DockerLinux && mv DockerLinux/bin/x64/Release_Linux/net6.0/* . && rm -rf DockerLinux
+RUN unzip -qq linux-binaries.zip -d . && \
+    rm linux-binaries.zip && \
+    chmod -R 0755 DockerLinux && \
+    mv DockerLinux/bin/x64/Release_Linux/net6.0/* . && \
+    rm -rf DockerLinux
 
 # Let the dynamic link loader where to search for shared libraries
 ENV LD_LIBRARY_PATH="/app"
diff --git a/docker/Dockerfile.windows b/docker/windows/Dockerfile
similarity index 77%
rename from docker/Dockerfile.windows
rename to docker/windows/Dockerfile
index 770155540a..3654b92099 100644
--- a/docker/Dockerfile.windows
+++ b/docker/windows/Dockerfile
@@ -1,3 +1,5 @@
+# hadolint shell = cmd.exe
+#
 # Geometry service Windows-based Dockerfile
 #
 # Based on mcr.microsoft.com/dotnet/framework/runtime:4.7.2-windowsservercore-ltsc2019
@@ -15,10 +17,12 @@ WORKDIR /app
 
 # Add the binary files from the latest release
 COPY windows-binaries.zip .
-RUN mkdir tmp_folder && tar -xf windows-binaries.zip -C tmp_folder
-RUN xcopy "tmp_folder\DockerWindows\bin\x64\Release_Headless\net472\*" ".\" /s /e /i /h
-RUN xcopy "tmp_folder\DockerWindows\*" ".\"
-RUN del windows-binaries.zip && rmdir /s /q tmp_folder
+RUN mkdir tmp_folder && \
+    tar -xf windows-binaries.zip -C tmp_folder && \
+    xcopy tmp_folder\DockerWindows\bin\x64\Release_Headless\net472\* . /e /i /h && \
+    xcopy tmp_folder\DockerWindows\* . && \
+    del windows-binaries.zip && \
+    rmdir /s /q tmp_folder
 
 # Defining environment variables
 ENV LICENSE_SERVER=""