diff --git a/hilla-dev/pom.xml b/hilla-dev/pom.xml
index 5f10c2e83..2f3814259 100644
--- a/hilla-dev/pom.xml
+++ b/hilla-dev/pom.xml
@@ -14,6 +14,9 @@
     <description>Hilla Platform Development Dependencies</description>
     <version>${hilla.version}</version>
     <url>https://hilla.dev</url>
+    <properties>
+        <skipNexusStagingDeployMojo>false</skipNexusStagingDeployMojo>
+    </properties>    
     <distributionManagement>
         <repository>
             <id>vaadin-prereleases</id>
diff --git a/hilla-react-spring-boot-starter/pom.xml b/hilla-react-spring-boot-starter/pom.xml
index 28e38868e..d3e2f22fd 100644
--- a/hilla-react-spring-boot-starter/pom.xml
+++ b/hilla-react-spring-boot-starter/pom.xml
@@ -13,7 +13,9 @@
     <name>Hilla-React Spring Boot Starter</name>
     <description>Spring Boot Starter for Hilla applications using React.</description>
     <version>${hilla.version}</version>
-
+    <properties>
+        <skipNexusStagingDeployMojo>false</skipNexusStagingDeployMojo>
+    </properties>
     <repositories>
         <!-- The order of definitions matters. Explicitly defining central here to make sure it has the highest priority. -->
 
diff --git a/hilla-react/pom.xml b/hilla-react/pom.xml
index b3e9c173b..5fa922a44 100644
--- a/hilla-react/pom.xml
+++ b/hilla-react/pom.xml
@@ -14,6 +14,9 @@
     <description>Hilla Platform for React-based Applications</description>
     <version>${hilla.version}</version>
     <url>https://hilla.dev</url>
+    <properties>
+        <skipNexusStagingDeployMojo>false</skipNexusStagingDeployMojo>
+    </properties>    
     <distributionManagement>
         <repository>
             <id>vaadin-prereleases</id>
diff --git a/hilla-spring-boot-starter/pom.xml b/hilla-spring-boot-starter/pom.xml
index 90497482f..e655f600c 100644
--- a/hilla-spring-boot-starter/pom.xml
+++ b/hilla-spring-boot-starter/pom.xml
@@ -13,7 +13,9 @@
     <name>Hilla Spring Boot Starter</name>
     <description>Spring Boot Starter for Hilla applications using Lit.</description>
     <version>${hilla.version}</version>
-
+    <properties>
+        <skipNexusStagingDeployMojo>false</skipNexusStagingDeployMojo>
+    </properties>
     <repositories>
         <!-- The order of definitions matters. Explicitly defining central here to make sure it has the highest priority. -->
 
diff --git a/hilla/pom.xml b/hilla/pom.xml
index daaba011e..eb373972a 100644
--- a/hilla/pom.xml
+++ b/hilla/pom.xml
@@ -14,6 +14,9 @@
     <description>Hilla Platform</description>
     <version>${hilla.version}</version>
     <url>https://hilla.dev</url>
+    <properties>
+        <skipNexusStagingDeployMojo>false</skipNexusStagingDeployMojo>
+    </properties>
     <distributionManagement>
         <repository>
             <id>vaadin-prereleases</id>
diff --git a/pom.xml b/pom.xml
index 867733fc5..62b0917b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,23 +31,7 @@
         </repository>
     </distributionManagement>
 
-    <modules>
-        <module>vaadin-internal</module>
-        <module>vaadin</module>
-        <module>vaadin-spring-bom</module>
-        <module>vaadin-bom</module>
-        <module>vaadin-core-internal</module>
-        <module>vaadin-core</module>
-        <module>vaadin-dev</module>
-        <module>vaadin-maven-plugin</module>
-        <module>vaadin-testbench</module>
-        <module>vaadin-testbench-junit5</module>
-        <module>vaadin-spring-boot-starter</module>
-        <module>vaadin-platform-javadoc</module>
-        <module>vaadin-dev-bundle</module>
-        <module>vaadin-prod-bundle/pom-unoptimized.xml</module>
-        <module>vaadin-prod-bundle</module>
-    </modules>
+
 
     <profiles>
         <profile>
@@ -58,9 +42,6 @@
         </profile>
         <profile>
             <id>gradle</id>
-            <activation>
-                <jdk>(,18)</jdk>
-            </activation>
             <modules>
                 <module>vaadin-gradle-plugin</module>
                 <module>vaadin-gradle-plugin/pom-portal.xml</module>
@@ -74,7 +55,7 @@
                 <module>vaadin-quarkus-extension</module>
             </modules>
         </profile>
-        <!-- separate hilla related moduels for releases -->
+        <!-- separate hilla related modules for releases -->
         <profile>
             <id>hilla</id>
             <modules>
@@ -85,6 +66,40 @@
                 <module>hilla-spring-boot-starter</module>
                 <module>hilla-react-spring-boot-starter</module>
             </modules>
+            <!-- This prevents deploying all com.vaadin modules, but we need to set it to true in
+            all hilla modules  -->
+            <properties>
+                <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
+            </properties>
+        </profile>
+        <!-- separate platform modules for active by default it must be after hilla modules -->
+        <profile>
+            <id>platform</id>
+            <activation>
+                <property>
+                    <name>!skipPlatform</name>
+                </property>
+            </activation>
+            <modules>
+                <module>vaadin-internal</module>
+                <module>vaadin</module>
+                <module>vaadin-spring-bom</module>
+                <module>vaadin-bom</module>
+                <module>vaadin-core-internal</module>
+                <module>vaadin-core</module>
+                <module>vaadin-dev</module>
+                <module>vaadin-maven-plugin</module>
+                <module>vaadin-testbench</module>
+                <module>vaadin-testbench-junit5</module>
+                <module>vaadin-spring-boot-starter</module>
+                <module>vaadin-platform-javadoc</module>
+                <module>vaadin-dev-bundle</module>
+                <module>vaadin-prod-bundle/pom-unoptimized.xml</module>
+                <module>vaadin-prod-bundle</module>
+            </modules>
+            <properties>
+                <skipNexusStagingDeployMojo>false</skipNexusStagingDeployMojo>
+            </properties>
         </profile>
         <!-- Needed so as we can skip this module on releasing and still nexus stating works -->
         <profile>
diff --git a/scripts/generator/templates/template-hilla-bom.xml b/scripts/generator/templates/template-hilla-bom.xml
index 2ec28d8e8..724461127 100644
--- a/scripts/generator/templates/template-hilla-bom.xml
+++ b/scripts/generator/templates/template-hilla-bom.xml
@@ -16,6 +16,7 @@
 	
     <properties>
         {{javadeps}}
+        <skipNexusStagingDeployMojo>false</skipNexusStagingDeployMojo>
     </properties>
 
     <distributionManagement>
diff --git a/scripts/generator/templates/template-servlet-containers-tests-pom.xml b/scripts/generator/templates/template-servlet-containers-tests-pom.xml
index 4000d4ef4..6ecccb21d 100644
--- a/scripts/generator/templates/template-servlet-containers-tests-pom.xml
+++ b/scripts/generator/templates/template-servlet-containers-tests-pom.xml
@@ -18,7 +18,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <failOnMissingWebXml>false</failOnMissingWebXml>
-        <maven.deploy.skip>true</maven.deploy.skip>
+        <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
         <!-- this version is needed for app.bndrun file -->
         {{javadeps}}
     </properties>
diff --git a/vaadin-platform-hybrid-test/pom.xml b/vaadin-platform-hybrid-test/pom.xml
index e3b72c412..876cd510b 100644
--- a/vaadin-platform-hybrid-test/pom.xml
+++ b/vaadin-platform-hybrid-test/pom.xml
@@ -18,7 +18,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <failOnMissingWebXml>false</failOnMissingWebXml>
-        <maven.deploy.skip>true</maven.deploy.skip>
+        <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
     </properties>
     <dependencyManagement>
         <dependencies>
diff --git a/vaadin-platform-test/pom.xml b/vaadin-platform-test/pom.xml
index aa28d8e0e..99382d8ee 100644
--- a/vaadin-platform-test/pom.xml
+++ b/vaadin-platform-test/pom.xml
@@ -15,7 +15,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <failOnMissingWebXml>false</failOnMissingWebXml>
-        <maven.deploy.skip>true</maven.deploy.skip>
+        <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
         <osgi.bundle.version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</osgi.bundle.version>
     </properties>
     <dependencyManagement>