diff --git a/packaging/Docker/Dockerfile.dev b/packaging/Docker/Dockerfile.dev
index 18d7d68fd..c12d26095 100644
--- a/packaging/Docker/Dockerfile.dev
+++ b/packaging/Docker/Dockerfile.dev
@@ -77,9 +77,10 @@ RUN pip3 install -r requirements.txt
 
 # Install CIMpp from source
 RUN cd /tmp && \
-	git clone --recurse-submodules https://github.com/cim-iec/libcimpp.git && \
+	git clone https://github.com/sogno-platform/libcimpp.git && \
 	mkdir -p libcimpp/build && cd libcimpp/build && \
 	git checkout ${CIMPP_COMMIT} && \
+	git submodule update --init && \
 	cmake ${CMAKE_OPTS} ..\
 		-DBUILD_SHARED_LIBS=ON \
 		-DCMAKE_INSTALL_LIBDIR=/usr/local/lib64 \
diff --git a/packaging/Docker/Dockerfile.dev-debian b/packaging/Docker/Dockerfile.dev-debian
index bfcec6f14..f49bc6974 100644
--- a/packaging/Docker/Dockerfile.dev-debian
+++ b/packaging/Docker/Dockerfile.dev-debian
@@ -81,9 +81,10 @@ RUN pip3 install -r requirements.txt
 
 ## Install CIMpp from source
 RUN cd /tmp && \
-	git clone --recurse-submodules https://github.com/cim-iec/libcimpp.git && \
+	git clone https://github.com/sogno-platform/libcimpp.git && \
 	mkdir -p libcimpp/build && cd libcimpp/build && \
 	git checkout ${CIMPP_COMMIT} && \
+	git submodule update --init && \
 	cmake ${CMAKE_OPTS} .. \
 		-DBUILD_SHARED_LIBS=ON \
 		-DCMAKE_INSTALL_LIBDIR=/usr/local/lib \
diff --git a/packaging/Docker/Dockerfile.dev-rocky b/packaging/Docker/Dockerfile.dev-rocky
index 1685383a1..236d6b9d8 100644
--- a/packaging/Docker/Dockerfile.dev-rocky
+++ b/packaging/Docker/Dockerfile.dev-rocky
@@ -92,9 +92,10 @@ RUN pip3 install gprof2dot
 
 # Install CIMpp from source
 RUN cd /tmp && \
-	git clone --recurse-submodules https://github.com/cim-iec/libcimpp.git && \
+	git clone https://github.com/sogno-platform/libcimpp.git && \
 	mkdir -p libcimpp/build && cd libcimpp/build && \
 	git checkout ${CIMPP_COMMIT} && \
+	git submodule update --init && \
 	cmake ${CMAKE_OPTS} ..\
 		-DCMAKE_INSTALL_LIBDIR=/usr/local/lib64 \
 		-DUSE_CIM_VERSION=${CIM_VERSION} \
diff --git a/packaging/Docker/Dockerfile.manylinux b/packaging/Docker/Dockerfile.manylinux
index 12912fca3..a27a4e53b 100644
--- a/packaging/Docker/Dockerfile.manylinux
+++ b/packaging/Docker/Dockerfile.manylinux
@@ -69,9 +69,10 @@ RUN pip3 install -r requirements-manylinux.txt
 
 # Install CIMpp from source
 RUN cd /tmp && \
-	git clone --recurse-submodules https://github.com/cim-iec/libcimpp.git && \
+	git clone https://github.com/sogno-platform/libcimpp.git && \
 	mkdir -p libcimpp/build && cd libcimpp/build && \
 	git checkout ${CIMPP_COMMIT} && \
+	git submodule update --init && \
 	cmake ${CMAKE_OPTS} .. \
 		-DCMAKE_INSTALL_LIBDIR=/usr/local/lib64 \
 		-DUSE_CIM_VERSION=${CIM_VERSION} \