diff --git a/.github/workflows/maven-build-skip.yml b/.github/workflows/maven-build-skip.yml
index cbb5f55c8fa1..4fdb92754f93 100644
--- a/.github/workflows/maven-build-skip.yml
+++ b/.github/workflows/maven-build-skip.yml
@@ -12,7 +12,7 @@
 # Avoid running Maven CI on each PR opened which does not modify Java or UI code
 # https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-
 # of-pull-requests/troubleshooting-required-status-checks#handling-skipped-but-required-checks
-name: Maven CI
+name: Maven MySQL Tests CI
 
 on:
   pull_request_target:
diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml
index d292a1815d07..dbce4406ae7d 100644
--- a/.github/workflows/maven-build.yml
+++ b/.github/workflows/maven-build.yml
@@ -99,20 +99,11 @@ jobs:
           sudo apt-get install -y unixodbc-dev python3-venv librdkafka-dev gcc libsasl2-dev build-essential libssl-dev libffi-dev \
           librdkafka-dev unixodbc-dev libevent-dev jq
           sudo make install_antlr_cli
-      
-      - name: Build PR with Maven
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        if: ${{ github.event_name == 'pull_request_target' }}
-        run: |
-          git fetch --no-tags https://github.com/open-metadata/OpenMetadata.git +refs/heads/main:refs/remotes/origin/main
-          mvn -pl :openmetadata-service clean package -am
 
       - name: Build with Maven
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        if: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
-        run: mvn -Dsonar.login=${{ secrets.SONAR_TOKEN }} clean package
+        run: mvn clean package -am
 
       - name: Clean Up
         run: |
diff --git a/.github/workflows/maven-postgres-tests-build.yml b/.github/workflows/maven-postgres-tests-build.yml
index 53213ed80d3d..729658611b74 100644
--- a/.github/workflows/maven-postgres-tests-build.yml
+++ b/.github/workflows/maven-postgres-tests-build.yml
@@ -98,20 +98,11 @@ jobs:
           sudo apt-get install -y unixodbc-dev python3-venv librdkafka-dev gcc libsasl2-dev build-essential libssl-dev libffi-dev \
           librdkafka-dev unixodbc-dev libevent-dev jq
           sudo make install_antlr_cli
-      
-      - name: Build PR with Maven
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        if: ${{ github.event_name == 'pull_request_target' }}
-        run: |
-          git fetch --no-tags https://github.com/open-metadata/OpenMetadata.git +refs/heads/main:refs/remotes/origin/main
-          mvn -pl :openmetadata-service -Ppostgres-tests clean package -am
 
       - name: Build with Maven
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        if: ${{ github.event_name == 'push' }}
-        run: mvn clean package
+        run: mvn -Ppostgres-tests clean package -am
 
       - name: Clean Up
         run: |
diff --git a/.github/workflows/maven-sonar-build.yml b/.github/workflows/maven-sonar-build.yml
index 0f7aa571870b..8c784e5b7a66 100644
--- a/.github/workflows/maven-sonar-build.yml
+++ b/.github/workflows/maven-sonar-build.yml
@@ -99,20 +99,11 @@ jobs:
           sudo apt-get install -y unixodbc-dev python3-venv librdkafka-dev gcc libsasl2-dev build-essential libssl-dev libffi-dev \
           librdkafka-dev unixodbc-dev libevent-dev jq
           sudo make install_antlr_cli
-      
-      - name: Build PR with Maven
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        if: ${{ github.event_name == 'pull_request_target' }}
-        run: |
-          git fetch --no-tags https://github.com/open-metadata/OpenMetadata.git +refs/heads/main:refs/remotes/origin/main
-          mvn -pl :openmetadata-service -Pstatic-code-analysis clean package -am
 
       - name: Build with Maven
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        if: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
-        run: mvn -Dsonar.login=${{ secrets.SONAR_TOKEN }} -Pstatic-code-analysis -DskipTests clean package
+        run: mvn -Pstatic-code-analysis clean package -am
 
       - name: Clean Up
         run: |