diff --git a/.github/workflows/fuzzr.yml b/.github/workflows/fuzzr.yml
index 968e0231..30f471a6 100644
--- a/.github/workflows/fuzzr.yml
+++ b/.github/workflows/fuzzr.yml
@@ -16,11 +16,18 @@ 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) && 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 && github.repository_owner == 'RemedyIT'
+      run: |
+        echo "X11_BRANCH=${{ github.ref_name }}" >> $GITHUB_ENV
     - uses: actions/checkout@v2
     - uses: ruby/setup-ruby@v1
       with:
@@ -30,7 +37,7 @@ jobs:
       with:
         repository: RemedyIT/axcioma
         path: ${{ env.X11_BASE_ROOT }}
-        ref: v2.2.1_dev
+        ref: ${{ env.X11_BRANCH }}
     - name: install fuzzr gem
       run: |
         gem install fuzzr
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 9e06d6d5..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,31 +84,37 @@ jobs:
       CC: ${{ matrix.CC }}
       CXX: ${{ matrix.CXX }}
     steps:
+    - 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 && github.repository_owner == 'RemedyIT'
+      run: |
+        echo "X11_BRANCH=${{ github.ref_name }}" >> $GITHUB_ENV
     - uses: actions/checkout@v2
     - name: checkout ACE_TAO
       uses: actions/checkout@v2
       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:
         repository: RemedyIT/ridl
         path: ${{ env.RIDL_ROOT }}
-        ref: v2.2.1_dev
+        ref: ${{ env.X11_BRANCH }}
     - name: checkout axcioma
       uses: actions/checkout@v2
       with:
         repository: RemedyIT/axcioma
         path: ${{ env.X11_BASE_ROOT }}
-        ref: v2.2.1_dev
+        ref: ${{ env.X11_BRANCH }}
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 9a5332f9..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,31 +48,37 @@ 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) && 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 && github.repository_owner == 'RemedyIT'
+      run: |
+        echo "X11_BRANCH=${{ github.ref_name }}" >> $GITHUB_ENV
     - uses: actions/checkout@v2
     - name: checkout ACE_TAO
       uses: actions/checkout@v2
       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:
         repository: RemedyIT/ridl
         path: ${{ env.RIDL_ROOT }}
-        ref: v2.2.1_dev
+        ref: ${{ env.X11_BRANCH }}
     - name: checkout axcioma
       uses: actions/checkout@v2
       with:
         repository: RemedyIT/axcioma
         path: ${{ env.X11_BASE_ROOT }}
-        ref: v2.2.1_dev
+        ref: ${{ env.X11_BRANCH }}
     - uses: ilammy/msvc-dev-cmd@v1
     - uses: actions/setup-ruby@v1
       with: