diff --git a/.github/workflows/pr-builder.yml b/.github/workflows/pr-builder.yml
index f9b7834d332..18796664215 100644
--- a/.github/workflows/pr-builder.yml
+++ b/.github/workflows/pr-builder.yml
@@ -142,6 +142,7 @@ jobs:
 
   test:
     name: 👾 Unit Test (TESTING)
+    if: ${{ false }}
     needs: [ typecheck ]
     runs-on: ubuntu-latest
     strategy:
@@ -227,7 +228,7 @@ jobs:
 
   build:
     name: 🚧 Build
-    needs: [ test, typecheck ]
+    needs: [ typecheck ]
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -239,6 +240,8 @@ jobs:
       - name: ⬇️ Checkout
         id: checkout
         uses: actions/checkout@v2.3.3
+        with:
+          fetch-depth: 0
 
       - name: 🟢 Setup node
         id: setup-node
@@ -246,6 +249,12 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
 
+      - name: 🐳 Set SHAs for Nx
+        id: set-shas
+        uses: nrwl/nx-set-shas@v3
+        with:
+          main-branch-name: "master"
+
       - name: ☕ Set up JDK 11
         id: jdk-setup
         uses: actions/setup-java@v3
@@ -286,13 +295,13 @@ jobs:
 
       - name: 👷 PNPM Build
         id: build-with-pnpm
-        run: pnpm build
+        run: pnpm nx affected --base=${{ env.NX_BASE }} --head=${{ env.NX_HEAD }} --target=build --parallel=3
 
-      - name: 🏗️ Maven Build identity-apps-core
-        id: build-with-maven
-        run: |
-          cd identity-apps-core
-          mvn clean install -U -Dlint.exec.skip=true -Dbootstrap.exec.skip=true
+    #   - name: 🏗️ Maven Build identity-apps-core
+    #     id: build-with-maven
+    #     run: |
+    #       cd identity-apps-core
+    #       mvn clean install -U -Dlint.exec.skip=true -Dbootstrap.exec.skip=true
 
       - name: 💾 Cache local Maven repository
         id: cache-maven-m2
diff --git a/identity-apps-core/apps/authentication-portal/src/main/webapp/add-security-questions.jsp b/identity-apps-core/apps/authentication-portal/src/main/webapp/add-security-questions.jsp
index 7697489b6aa..aabace422f6 100644
--- a/identity-apps-core/apps/authentication-portal/src/main/webapp/add-security-questions.jsp
+++ b/identity-apps-core/apps/authentication-portal/src/main/webapp/add-security-questions.jsp
@@ -17,6 +17,9 @@
 --%>
 
 <%@ page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8" %>
+
+
+
 <%@ page import="org.owasp.encoder.Encode" %>
 <%@ page import="org.wso2.carbon.identity.application.authentication.endpoint.util.AuthenticationEndpointUtil" %>
 <%@ page import="org.wso2.carbon.identity.application.authentication.endpoint.util.EncodedControl" %>
diff --git a/identity-apps-core/package.json b/identity-apps-core/package.json
index d162b94cf58..1f3f8b5e421 100644
--- a/identity-apps-core/package.json
+++ b/identity-apps-core/package.json
@@ -6,7 +6,9 @@
     "author": "WSO2",
     "license": "Apache-2.0",
     "scripts": {
-        "build": "pnpm nx run theme:build && node theme-distribute.js",
+        "build:theme-module": "pnpm nx run theme:build && node theme-distribute.js",
+        "build": "pnpm build:theme-module && pnpm build:maven",
+        "build:maven": "mvn clean install",
         "clean": "pnpm clean:lock-files && pnpm clean:maven-folders && pnpm clean:node-modules",
         "clean:lock-files": "pnpm rimraf package-lock.json && pnpm rimraf pnpm-lock.yaml && pnpm rimraf yarn.lock",
         "clean:maven-folders": "pnpm rimraf target",
diff --git a/identity-apps-core/pom.xml b/identity-apps-core/pom.xml
index 7c88c3828a3..1f8232c1a43 100644
--- a/identity-apps-core/pom.xml
+++ b/identity-apps-core/pom.xml
@@ -581,68 +581,6 @@
 
     <build>
         <plugins>
-            <!-- Build all npm packages (apps & modules) -->
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <version>1.6.0</version>
-                <artifactId>exec-maven-plugin</artifactId>
-                <inherited>false</inherited>
-                <executions>
-                    <execution>
-                        <id>npm install (initialize)</id>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <phase>initialize</phase>
-                        <configuration>
-                            <executable>pnpm</executable>
-                            <arguments>
-                                <argument>install</argument>
-                            </arguments>
-                            <skip>${bootstrap.exec.skip}</skip>
-                            <workingDirectory>${basedir}</workingDirectory>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>run-linter</id>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <phase>process-resources</phase>
-                        <configuration>
-                            <executable>pnpm</executable>
-                            <arguments>
-                                <argument>lint</argument>
-                            </arguments>
-                            <skip>${lint.exec.skip}</skip>
-                            <workingDirectory>${basedir}</workingDirectory>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>npm run build (compile)</id>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <phase>compile</phase>
-                        <configuration>
-                            <executable>pnpm</executable>
-                            <arguments>
-                                <argument>build</argument>
-                            </arguments>
-                            <workingDirectory>${basedir}</workingDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-                <configuration>
-                    <environmentVariables>
-                        <!-- The following parameters create an NPM sandbox for CI -->
-                        <NPM_CONFIG_PREFIX>${basedir}/npm</NPM_CONFIG_PREFIX>
-                        <NPM_CONFIG_CACHE>${NPM_CONFIG_PREFIX}/cache</NPM_CONFIG_CACHE>
-                        <NPM_CONFIG_TMP>${project.build.directory}/npmtmp</NPM_CONFIG_TMP>
-                    </environmentVariables>
-                </configuration>
-            </plugin>
-
             <!-- Release -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>