diff --git a/.github/workflows/pr-ci-maintenance.yaml b/.github/workflows/pr-ci-maintenance.yaml
new file mode 100644
index 000000000..79e50bf1c
--- /dev/null
+++ b/.github/workflows/pr-ci-maintenance.yaml
@@ -0,0 +1,31 @@
+name: Pull Request CI
+on:
+  workflow_dispatch:
+  pull_request:
+    branches:
+      - 1.x
+      - 2.x
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        java: ['11', '17', '21']
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK ${{ matrix.java }}
+        uses: actions/setup-java@v1
+        with:
+          java-version: ${{ matrix.java }}
+      - name: Cache Maven packages
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-m2
+      - name: Version Info
+        run: mvn -version
+      - name: Build with Maven
+        run: mvn -B verify --file pom.xml
diff --git a/.github/workflows/pr-ci.yaml b/.github/workflows/pr-ci.yaml
index 57b4598ec..1a8d7f14a 100644
--- a/.github/workflows/pr-ci.yaml
+++ b/.github/workflows/pr-ci.yaml
@@ -3,9 +3,8 @@ on:
   workflow_dispatch:
   pull_request:
     branches:
-      - 1.x
-      - 2.x
       - 3.x
+      - 4.x
 
 jobs:
   build:
@@ -13,22 +12,13 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        java: ['11', '17', '21']
+        java: ['21']
     steps:
       - uses: actions/checkout@v2
       - name: Set up JDK ${{ matrix.java }}
         uses: actions/setup-java@v1
         with:
           java-version: ${{ matrix.java }}
-      # ELY-2204 - Temporarily preventing OidcTest from running on macOS since there
-      # are intermittent issues with starting up the Docker container.
-      #- if: matrix.os == 'macos-latest'
-      #  name: Install docker
-      #  run: |
-      #    brew install docker docker-machine docker-compose
-      #    brew services start docker-machine
-      #    docker-machine create --driver virtualbox default
-      #    docker --version
       - name: Cache Maven packages
         uses: actions/cache@v2
         with: