diff --git a/.github/workflows/fuzzr.yml b/.github/workflows/fuzzr.yml
index f4499722..30f471a6 100644
--- a/.github/workflows/fuzzr.yml
+++ b/.github/workflows/fuzzr.yml
@@ -16,15 +16,16 @@ concurrency:
 
 env:
   X11_BASE_ROOT: ${{ github.workspace }}/axcioma
+  X11_BRANCH: v2.2.1_dev
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - if: contains(fromJson('["pull_request", "pull_request_target"]'), github.event_name)
+    - if: contains(fromJson('["pull_request", "pull_request_target"]'), github.event_name) && github.repository_owner == 'RemedyIT'
       run: |
         echo "X11_BRANCH=${{ github.base_ref }}" >> $GITHUB_ENV
-    - if: contains(fromJson('["pull_request", "pull_request_target"]'), github.event_name) == false
+    - if: contains(fromJson('["pull_request", "pull_request_target"]'), github.event_name) == false && github.repository_owner == 'RemedyIT'
       run: |
         echo "X11_BRANCH=${{ github.ref_name }}" >> $GITHUB_ENV
     - uses: actions/checkout@v2
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 1ae129ad..b3c9e4d9 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -27,6 +27,8 @@ env:
   X11_BASE_ROOT: ${{ github.workspace }}/axcioma
   RIDL_ROOT: ${{ github.workspace }}/ridl
   TAOX11_ROOT: ${{ github.workspace }}
+  X11_BRANCH: v2.2.1_dev
+  ACETAOMPC_BRANCH: ACE+TAO-7_0_4
 
 jobs:
   build:
@@ -82,10 +84,10 @@ jobs:
       CC: ${{ matrix.CC }}
       CXX: ${{ matrix.CXX }}
     steps:
-    - if: contains(fromJson('["pull_request", "pull_request_target"]'), github.event_name)
+    - if: contains(fromJson('["pull_request", "pull_request_target"]'), github.event_name) && github.repository_owner == 'RemedyIT'
       run: |
         echo "X11_BRANCH=${{ github.base_ref }}" >> $GITHUB_ENV
-    - if: contains(fromJson('["pull_request", "pull_request_target"]'), github.event_name) == false
+    - if: contains(fromJson('["pull_request", "pull_request_target"]'), github.event_name) == false && github.repository_owner == 'RemedyIT'
       run: |
         echo "X11_BRANCH=${{ github.ref_name }}" >> $GITHUB_ENV
     - uses: actions/checkout@v2
@@ -94,13 +96,13 @@ jobs:
       with:
         repository: DOCGroup/ACE_TAO
         path: ${{ env.DOC_ROOT }}
-        ref: ACE+TAO-7_0_4
+        ref: ${{ env.ACETAOMPC_BRANCH }}
     - name: checkout MPC
       uses: actions/checkout@v2
       with:
         repository: DOCGroup/MPC
         path: ${{ env.MPC_ROOT }}
-        ref: ACE+TAO-7_0_4
+        ref: ${{ env.ACETAOMPC_BRANCH }}
     - name: checkout ridl
       uses: actions/checkout@v2
       with:
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index d2d5b109..19653b48 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -27,6 +27,8 @@ env:
   X11_BASE_ROOT: ${{ github.workspace }}/axcioma
   RIDL_ROOT: ${{ github.workspace }}/ridl
   TAOX11_ROOT: ${{ github.workspace }}
+  X11_BRANCH: v2.2.1_dev
+  ACETAOMPC_BRANCH: ACE+TAO-7_0_4
 
 jobs:
   build:
@@ -46,10 +48,10 @@ jobs:
     runs-on: ${{ matrix.os }}
     name: ${{ matrix.os }} ruby-${{ matrix.ruby }} ${{ matrix.project_type }}
     steps:
-    - if: contains(fromJson('["pull_request", "pull_request_target"]'), github.event_name)
+    - if: contains(fromJson('["pull_request", "pull_request_target"]'), github.event_name) && github.repository_owner == 'RemedyIT'
       run: |
         echo "X11_BRANCH=${{ github.base_ref }}" >> $GITHUB_ENV
-    - if: contains(fromJson('["pull_request", "pull_request_target"]'), github.event_name) == false
+    - if: contains(fromJson('["pull_request", "pull_request_target"]'), github.event_name) == false && github.repository_owner == 'RemedyIT'
       run: |
         echo "X11_BRANCH=${{ github.ref_name }}" >> $GITHUB_ENV
     - uses: actions/checkout@v2
@@ -58,13 +60,13 @@ jobs:
       with:
         repository: DOCGroup/ACE_TAO
         path: ${{ env.DOC_ROOT }}
-        ref: ACE+TAO-7_0_4
+        ref: ${{ env.ACETAOMPC_BRANCH }}
     - name: checkout MPC
       uses: actions/checkout@v2
       with:
         repository: DOCGroup/MPC
         path: ${{ env.MPC_ROOT }}
-        ref: ACE+TAO-7_0_4
+        ref: ${{ env.ACETAOMPC_BRANCH }}
     - name: checkout ridl
       uses: actions/checkout@v2
       with: