diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml
index 401e516974..1548b35851 100644
--- a/.github/workflows/push-trigger.yml
+++ b/.github/workflows/push-trigger.yml
@@ -18,12 +18,12 @@ on:
       - release*
       - master
       - 1.*
-      - develop
+      - develop*
       - MOSIP*
 
 jobs:
   build-regclient:
-    uses: mosip/kattu/.github/workflows/maven-build.yml@master
+    uses: mosip/kattu/.github/workflows/maven-build.yml@master-java21
     with:
       SERVICE_LOCATION: registration
       BUILD_ARTIFACT: registration
@@ -43,11 +43,11 @@ jobs:
       BUILD_ARTIFACT: registration-local
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - name: Set up JDK 21
+        uses: actions/setup-java@v3
         with:
-          ref: ${{ github.ref }}
-          java-version: 11
+          distribution: 'temurin'
+          java-version: '21'
           server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml
           settings-path: ${{ github.workspace }} # location for the settings.xml file
 
@@ -83,7 +83,7 @@ jobs:
   publish_to_nexus:
     if: "${{ !contains(github.ref, 'master') && github.event_name != 'pull_request' && github.event_name != 'release' && github.event_name != 'prerelease' && github.event_name != 'publish' }}"
     needs: build-regclient-local
-    uses: mosip/kattu/.github/workflows/maven-publish-to-nexus.yml@master
+    uses: mosip/kattu/.github/workflows/maven-publish-to-nexus.yml@master-java21
     with:
       SERVICE_LOCATION: registration
     secrets:
@@ -105,7 +105,7 @@ jobs:
             ONLY_DOCKER: true
       fail-fast: false
     name: ${{ matrix.SERVICE_NAME }}
-    uses: mosip/kattu/.github/workflows/docker-build.yml@master
+    uses: mosip/kattu/.github/workflows/docker-build.yml@master-java21
     with:
       SERVICE_LOCATION: ${{ matrix.SERVICE_LOCATION }}
       SERVICE_NAME: ${{ matrix.SERVICE_NAME }}
@@ -120,7 +120,7 @@ jobs:
   sonar_analysis:
     needs: build-regclient-local
     if: "${{ github.event_name != 'pull_request' }}"
-    uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master
+    uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master-java21
     with:
       SERVICE_LOCATION: registration
     secrets:
diff --git a/registration/pom.xml b/registration/pom.xml
index 1c5f7f9504..a5570da34c 100644
--- a/registration/pom.xml
+++ b/registration/pom.xml
@@ -134,7 +134,7 @@
 		<!-- support jaxb in java11 -->
 		<javax.activation.version>1.2.0</javax.activation.version>
         <jaxb.api.version>2.3.1</jaxb.api.version>
-		<openjfx.version>11.0.2</openjfx.version>
+		<openjfx.version>21.0.3</openjfx.version>
 		
 		<sonar.coverage.exclusions>
 			**/dto/**,
diff --git a/registration/ref-impl/ref-document-scanner/pom.xml b/registration/ref-impl/ref-document-scanner/pom.xml
index 76bf6cb668..c12bbc0c0c 100644
--- a/registration/ref-impl/ref-document-scanner/pom.xml
+++ b/registration/ref-impl/ref-document-scanner/pom.xml
@@ -46,25 +46,25 @@
         <dependency>
             <groupId>morena7</groupId>
             <artifactId>morena7</artifactId>
-            <scope>system</scope>
+            <!--<scope>system</scope>-->
             <version>1.0</version>
-           <systemPath>C:\Users\61044292\Downloads\morena-7.1.36\lib\morena7.jar</systemPath>
+           <!-- <systemPath>${basedir}/lib/morena/morena7.jar</systemPath>-->
         </dependency>
 
         <dependency>
             <groupId>morena7-license</groupId>
             <artifactId>morena7-license</artifactId>
-            <scope>system</scope>
+            <!--<scope>system</scope>-->
             <version>1.0</version>
-            <systemPath>C:\Users\61044292\Downloads\morena-7.1.36\lib\morena_license.jar</systemPath>
+            <!--<systemPath>${basedir}/lib/morena/morena_license.jar</systemPath>-->
         </dependency>
 
         <dependency>
             <groupId>morena7-win</groupId>
             <artifactId>morena7-win</artifactId>
-           <scope>system</scope>
+           <!--<scope>system</scope>-->
             <version>1.0</version>
-           <systemPath>C:\Users\61044292\Downloads\morena-7.1.36\lib\morena7_win.jar</systemPath>
+           <!-- <systemPath>${basedir}/lib/morena/morena7_win.jar</systemPath>-->
         </dependency>
 
         <!--<dependency>
diff --git a/registration/registration-api-stub-impl/pom.xml b/registration/registration-api-stub-impl/pom.xml
index 78f9cfd61b..be2ae0dd7b 100644
--- a/registration/registration-api-stub-impl/pom.xml
+++ b/registration/registration-api-stub-impl/pom.xml
@@ -10,7 +10,9 @@
 		<version>1.2.1-java21-SNAPSHOT</version>
 	</parent>
 
+	<groupId>io.mosip.registration</groupId>
     <artifactId>registration-api-stub-impl</artifactId>
+    <version>1.2.1-java21-SNAPSHOT</version>
     
     <properties>
         <maven.compiler.source>21</maven.compiler.source>
diff --git a/registration/registration-api/pom.xml b/registration/registration-api/pom.xml
index c992093e2e..5411afecce 100644
--- a/registration/registration-api/pom.xml
+++ b/registration/registration-api/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
@@ -11,13 +11,14 @@
 	</parent>
  
     <artifactId>registration-api</artifactId>
+    <version>1.2.1-java21-SNAPSHOT</version>
     
     <properties>
         <maven.compiler.source>21</maven.compiler.source>
         <maven.compiler.target>21</maven.compiler.target>
         <spring.version>5.0.6.RELEASE</spring.version>
         <mosip.core.kernel.version>1.2.1-java21-SNAPSHOT</mosip.core.kernel.version>
-        <openjfx.version>11.0.2</openjfx.version>
+        <openjfx.version>21.0.3</openjfx.version>
         <spring-cloud-config.version>2.0.4.RELEASE</spring-cloud-config.version>
     </properties>
 
diff --git a/registration/registration-client/pom.xml b/registration/registration-client/pom.xml
index 63a59f6a14..22a0a689e9 100644
--- a/registration/registration-client/pom.xml
+++ b/registration/registration-client/pom.xml
@@ -12,6 +12,7 @@
 
 	<artifactId>registration-client</artifactId>
 	<packaging>jar</packaging>
+	<version>1.2.1-java21-SNAPSHOT</version>
 	<name>registration-client</name>
 	<description>Maven project of MOSIP Registration UI</description>
 
diff --git a/registration/registration-services/pom.xml b/registration/registration-services/pom.xml
index d69af819e3..774c21be48 100644
--- a/registration/registration-services/pom.xml
+++ b/registration/registration-services/pom.xml
@@ -11,6 +11,7 @@
 	<artifactId>registration-services</artifactId>
 	<name>registration-services</name>
 	<description>Maven project of MOSIP Registration Service</description>
+	<version>1.2.1-java21-SNAPSHOT</version>
 
 	<dependencies>
 		<!-- Lombok -->
diff --git a/registration/registration-test/pom.xml b/registration/registration-test/pom.xml
index 398fba7929..30788f8978 100644
--- a/registration/registration-test/pom.xml
+++ b/registration/registration-test/pom.xml
@@ -8,6 +8,7 @@
   <artifactId>registration-test</artifactId>
   <name>registration-test</name>
   <description>Maven project of MOSIP Registration Test</description>
+  <version>1.2.1-java21-SNAPSHOT</version>
    
    <properties>
       <maven.compiler.source>21</maven.compiler.source>