diff --git a/ccm-cms/package-lock.json b/ccm-cms/package-lock.json
index c2743a711..f3ed9887d 100644
--- a/ccm-cms/package-lock.json
+++ b/ccm-cms/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "@librecms/ccm-cms",
-    "version": "7.0.0-SNAPSHOT.2023-04-24T174449",
+    "version": "7.0.0-SNAPSHOT",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "@librecms/ccm-cms",
-            "version": "7.0.0-SNAPSHOT.2023-04-24T174449",
+            "version": "7.0.0-SNAPSHOT",
             "license": "LGPL-3.0-or-later",
             "dependencies": {
                 "@tiptap/core": "^2.0.0-beta.127",
diff --git a/ccm-cms/package.json b/ccm-cms/package.json
index 1668411a9..3fea6904d 100644
--- a/ccm-cms/package.json
+++ b/ccm-cms/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@librecms/ccm-cms",
-    "version": "7.0.0-SNAPSHOT.2023-04-24T174449",
+    "version": "7.0.0-SNAPSHOT",
     "description": "JavaScript stuff for ccm-cms",
     "main": "target/generated-resources/assets/@content-sections/cms-admin.js",
     "types": "target/generated-resources/assets/@content-sections/cms-admin.d.ts",
diff --git a/ccm-pagemodelseditor/package-lock.json b/ccm-pagemodelseditor/package-lock.json
index 2c39712ff..265f879b1 100644
--- a/ccm-pagemodelseditor/package-lock.json
+++ b/ccm-pagemodelseditor/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "@libreccm/ccm-pagemodelseditor",
-    "version": "7.0.0",
+    "version": "7.0.0-SNAPSHOT",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "@libreccm/ccm-pagemodelseditor",
-            "version": "7.0.0",
+            "version": "7.0.0-SNAPSHOT",
             "license": "GPL-3.0",
             "dependencies": {
                 "react": "^16.4.2",
diff --git a/ccm-pagemodelseditor/package.json b/ccm-pagemodelseditor/package.json
index 3bae2f787..ed4c6ecc6 100644
--- a/ccm-pagemodelseditor/package.json
+++ b/ccm-pagemodelseditor/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@libreccm/ccm-pagemodelseditor",
-    "version": "7.0.0",
+    "version": "7.0.0-SNAPSHOT",
     "main": "target/dist/PageModelsEditor.js",
     "types": "target/dist/PageModelsEditor.d.ts",
     "description": "Editor for PageModels build using React.js",
diff --git a/ccm-pagemodelseditor/pom.xml b/ccm-pagemodelseditor/pom.xml
index 6408f6798..23a710342 100644
--- a/ccm-pagemodelseditor/pom.xml
+++ b/ccm-pagemodelseditor/pom.xml
@@ -7,6 +7,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <timestamp>${maven.build.timestamp}</timestamp>
         <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ss'Z'Z</maven.build.timestamp.format>
+        <buildNumber></buildNumber>
     </properties>
 
     <parent>
@@ -141,6 +142,16 @@
                             <arguments>install</arguments>
                         </configuration>
                     </execution>
+                    <!-- Sync Maven module version and NPM module version -->
+                    <execution>
+                        <id>npm version</id>
+                        <goals>
+                            <goal>npm</goal>
+                        </goals>
+                        <configuration>
+                            <arguments>version --allow-same-version=true ${project.version}${buildNumber}</arguments>
+                        </configuration>
+                    </execution>
                     <execution>
                         <id>build</id>
                         <goals>
@@ -174,10 +185,21 @@
                     </execution>
                 </executions>
             </plugin>
-
-
         </plugins>
-
     </build>
 
+    <profiles>
+        <profile>
+            <id>with-buildnumber</id>
+            <activation>
+                <property>
+                    <name>env.BUILD_NUMBER</name>
+                </property>
+            </activation>
+            <properties>
+                <buildNumber>.${env.BUILD_NUMBER}</buildNumber>
+            </properties>
+        </profile>
+    </profiles>
+
 </project>
diff --git a/ccm-static-theme-index-builder/package-lock.json b/ccm-static-theme-index-builder/package-lock.json
index db72a8170..6ae43adbf 100644
--- a/ccm-static-theme-index-builder/package-lock.json
+++ b/ccm-static-theme-index-builder/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "@libreccm/ccm-static-theme-index-builder",
-    "version": "7.0.0-SNAPSHOT.23",
+    "version": "7.0.0-SNAPSHOT",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "@libreccm/ccm-static-theme-index-builder",
-            "version": "7.0.0-SNAPSHOT.23",
+            "version": "7.0.0-SNAPSHOT",
             "license": "GPL-3.0",
             "dependencies": {
                 "@types/mime-types": "^2.1.1",
diff --git a/ccm-static-theme-index-builder/package.json b/ccm-static-theme-index-builder/package.json
index b25f926a0..870f0eea2 100644
--- a/ccm-static-theme-index-builder/package.json
+++ b/ccm-static-theme-index-builder/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@libreccm/ccm-static-theme-index-builder",
-    "version": "7.0.0-SNAPSHOT.23",
+    "version": "7.0.0-SNAPSHOT",
     "type": "module",
     "main": "target/dist/StaticThemeIndexBuilder.js",
     "bin": {