diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2f6e116231..1bb6cb8621 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -31,11 +31,11 @@ jobs:
       - name: check formatting
         run: mvn spotless:check
 
-      - name: Initialize and build submodules
-        run: |
-          cd dataexport
-          mvn clean install  
-          cd ..
+      # - name: Initialize and build submodules
+      #   run: |
+      #     cd dataexport
+      #     mvn clean install  
+      #     cd ..
 
       - name: Build OpenELIS-Global2
         run: mvn clean install -Dspotless.check.skip=true
diff --git a/Dockerfile b/Dockerfile
index 23f545b1cf..55894ad8c9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,18 +20,21 @@ RUN ./install/createDefaultPassword.sh -c -p ${DEFAULT_PW}
 ##
 # Build DataExport
 #
-COPY ./dataexport /build/dataexport
-WORKDIR /build/dataexport/dataexport-core
-RUN --mount=type=cache,target=/root/.m2,sharing=locked \
-    mvn dependency:go-offline 
-RUN --mount=type=cache,target=/root/.m2,sharing=locked \
-    mvn clean install -DskipTests
-WORKDIR /build/dataexport/
-RUN --mount=type=cache,target=/root/.m2,sharing=locked \
-    mvn dependency:go-offline 
-RUN --mount=type=cache,target=/root/.m2,sharing=locked \
-    mvn clean install -DskipTests
+# COPY ./dataexport /build/dataexport
+# WORKDIR /build/dataexport/dataexport-core
+# RUN --mount=type=cache,target=/root/.m2,sharing=locked \
+#     mvn dependency:go-offline 
+# RUN --mount=type=cache,target=/root/.m2,sharing=locked \
+#     mvn clean install -DskipTests
+# WORKDIR /build/dataexport/
+# RUN --mount=type=cache,target=/root/.m2,sharing=locked \
+#     mvn dependency:go-offline 
+# RUN --mount=type=cache,target=/root/.m2,sharing=locked \
+#     mvn clean install -DskipTests
 
+##
+# Build the Project
+#  
 WORKDIR /build
 
 COPY ./pom.xml /build/pom.xml
diff --git a/Dockerfile.dev b/Dockerfile.dev
index db87b5d946..911d4e15ba 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -16,7 +16,7 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
 ADD ./pom.xml /build/pom.xml
 ADD ./tools /build/tools
 ADD ./src /build/src
-ADD ./dataexport /build/dataexport
+# ADD ./dataexport /build/dataexport
 
 WORKDIR /build
 
@@ -28,17 +28,20 @@ RUN ./install/createDefaultPassword.sh -c -p ${DEFAULT_PW}
 ##
 # Build DataExport
 #
-WORKDIR /build/dataexport/dataexport-core
-RUN --mount=type=cache,target=/root/.m2,sharing=locked \
-    mvn dependency:go-offline 
-RUN --mount=type=cache,target=/root/.m2,sharing=locked \
-    mvn clean install -DskipTests
-WORKDIR /build/dataexport/
-RUN --mount=type=cache,target=/root/.m2,sharing=locked \
-    mvn dependency:go-offline 
-RUN --mount=type=cache,target=/root/.m2,sharing=locked \
-    mvn clean install -DskipTests
+# WORKDIR /build/dataexport/dataexport-core
+# RUN --mount=type=cache,target=/root/.m2,sharing=locked \
+#     mvn dependency:go-offline 
+# RUN --mount=type=cache,target=/root/.m2,sharing=locked \
+#     mvn clean install -DskipTests
+# WORKDIR /build/dataexport/
+# RUN --mount=type=cache,target=/root/.m2,sharing=locked \
+#     mvn dependency:go-offline 
+# RUN --mount=type=cache,target=/root/.m2,sharing=locked \
+#     mvn clean install -DskipTests
 
+##
+# Build the Project
+#    
 WORKDIR /build
 
 RUN --mount=type=cache,target=/root/.m2,sharing=locked \