diff --git a/Jenkinsfile b/Jenkinsfile
index 731d0662552..263c7867a9a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -187,8 +187,10 @@ spec:
         container('maven') {
           dumpSysInfo()
           sh '''
+            # Validate the structure in all submodules (especially version ids)
+            mvn -B -e -fae clean validate -Ptck,set-version-id,staging
             # Until we fix ANTLR in cmp-support-sqlstore, broken in parallel builds. Just -Pfast after the fix.
-            mvn -B -e clean install -Pfastest,staging -T4C
+            mvn -B -e install -Pfastest,staging -T4C
             ./gfbuild.sh archive_bundles
             ./gfbuild.sh archive_embedded
             mvn -B -e clean -Pstaging