diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index 94ae1470..02820ce5 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -22,7 +22,7 @@ env:
 
 jobs:
   go:
-    runs-on: ubuntu-20.04
+    runs-on: fabric-ubuntu-20.04
     steps:
       - uses: actions/setup-go@v3
         with:
@@ -32,7 +32,7 @@ jobs:
       - run: ci/scripts/lint-go.sh
 
   typescript:
-    runs-on: ubuntu-20.04
+    runs-on: fabric-ubuntu-20.04
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
@@ -41,7 +41,7 @@ jobs:
       - run: ci/scripts/lint-typescript.sh
 
   javascript:
-    runs-on: ubuntu-20.04
+    runs-on: fabric-ubuntu-20.04
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
@@ -50,7 +50,7 @@ jobs:
       - run: ci/scripts/lint-javascript.sh
 
   java:
-    runs-on: ubuntu-20.04
+    runs-on: fabric-ubuntu-20.04
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
@@ -60,7 +60,7 @@ jobs:
       - run: ci/scripts/lint-java.sh
 
   shell:
-    runs-on: ubuntu-20.04
+    runs-on: fabric-ubuntu-20.04
     steps:
       - uses: actions/checkout@v3
       - run: ci/scripts/lint-shell.sh
diff --git a/.github/workflows/rest-sample.yaml b/.github/workflows/rest-sample.yaml
index df85b1c3..eca5ac4e 100644
--- a/.github/workflows/rest-sample.yaml
+++ b/.github/workflows/rest-sample.yaml
@@ -22,7 +22,7 @@ concurrency:
 
 jobs:
   test-sample:
-    runs-on: ubuntu-20.04
+    runs-on: fabric-ubuntu-20.04
 
     steps:
       - name: Checkout
diff --git a/.github/workflows/test-fsat.yaml b/.github/workflows/test-fsat.yaml
index 8b6a02a2..60f6e305 100644
--- a/.github/workflows/test-fsat.yaml
+++ b/.github/workflows/test-fsat.yaml
@@ -14,7 +14,7 @@ concurrency:
 
 jobs:
   ansible:
-    runs-on: ubuntu-20.04
+    runs-on: fabric-ubuntu-20.04
     steps:
       - uses: actions/checkout@v3
       - name: Set up Full Stack Runtime
@@ -23,7 +23,7 @@ jobs:
         working-directory: full-stack-asset-transfer-guide
 
   appdev:
-    runs-on: ubuntu-20.04
+    runs-on: fabric-ubuntu-20.04
     steps:
       - uses: actions/checkout@v3
       - name: Set up Full Stack Runtime
@@ -32,7 +32,7 @@ jobs:
         working-directory: full-stack-asset-transfer-guide
 
   chaincode:
-    runs-on: ubuntu-20.04
+    runs-on: fabric-ubuntu-20.04
     steps:
       - uses: actions/checkout@v3
       - name: Set up Full Stack Runtime
@@ -41,7 +41,7 @@ jobs:
         working-directory: full-stack-asset-transfer-guide
 
   cloud:
-    runs-on: ubuntu-20.04
+    runs-on: fabric-ubuntu-20.04
     steps:
       - uses: actions/checkout@v3
       - name: Set up Full Stack Runtime
@@ -50,7 +50,7 @@ jobs:
         working-directory: full-stack-asset-transfer-guide
 
   console:
-    runs-on: ubuntu-20.04
+    runs-on: fabric-ubuntu-20.04
     steps:
       - uses: actions/checkout@v3
       - name: Set up Full Stack Runtime
diff --git a/.github/workflows/test-network-basic.yaml b/.github/workflows/test-network-basic.yaml
index a60854e8..939fa4e1 100644
--- a/.github/workflows/test-network-basic.yaml
+++ b/.github/workflows/test-network-basic.yaml
@@ -17,7 +17,7 @@ concurrency:
 
 jobs:
   basic:
-    runs-on: ubuntu-20.04
+    runs-on: fabric-ubuntu-20.04
     strategy:
       matrix:
         chaincode-language:
diff --git a/.github/workflows/test-network-events.yaml b/.github/workflows/test-network-events.yaml
index afa63830..4cd28fed 100644
--- a/.github/workflows/test-network-events.yaml
+++ b/.github/workflows/test-network-events.yaml
@@ -17,7 +17,7 @@ concurrency:
 
 jobs:
   events:
-    runs-on: ubuntu-20.04
+    runs-on: fabric-ubuntu-20.04
     strategy:
       matrix:
         chaincode-language:
diff --git a/.github/workflows/test-network-gateway.yaml b/.github/workflows/test-network-gateway.yaml
index 593ac416..6d85c3e9 100644
--- a/.github/workflows/test-network-gateway.yaml
+++ b/.github/workflows/test-network-gateway.yaml
@@ -17,7 +17,7 @@ concurrency:
 
 jobs:
   gateway:
-    runs-on: ubuntu-20.04
+    runs-on: fabric-ubuntu-20.04
     strategy:
       matrix:
         chaincode-language:
diff --git a/.github/workflows/test-network-hsm.yaml b/.github/workflows/test-network-hsm.yaml
index a7a671ac..806f9142 100644
--- a/.github/workflows/test-network-hsm.yaml
+++ b/.github/workflows/test-network-hsm.yaml
@@ -17,7 +17,7 @@ concurrency:
 
 jobs:
   hsm:
-    runs-on: ubuntu-20.04
+    runs-on: fabric-ubuntu-20.04
     strategy:
       matrix:
         chaincode-language:
diff --git a/.github/workflows/test-network-k8s.yaml b/.github/workflows/test-network-k8s.yaml
index 51faf491..b6c905c0 100644
--- a/.github/workflows/test-network-k8s.yaml
+++ b/.github/workflows/test-network-k8s.yaml
@@ -17,7 +17,7 @@ concurrency:
 
 jobs:
   ccaas-java:
-    runs-on: ubuntu-20.04
+    runs-on: fabric-ubuntu-20.04
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -29,7 +29,7 @@ jobs:
           CHAINCODE_LANGUAGE: java
 
   ccaas-external:
-    runs-on: ubuntu-20.04
+    runs-on: fabric-ubuntu-20.04
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -41,7 +41,7 @@ jobs:
           CHAINCODE_LANGUAGE: external
 
   k8s-builder:
-    runs-on: ubuntu-20.04
+    runs-on: fabric-ubuntu-20.04
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -54,7 +54,7 @@ jobs:
           CHAINCODE_BUILDER: k8s
 
   multi-namespace:
-    runs-on: ubuntu-20.04
+    runs-on: fabric-ubuntu-20.04
     steps:
       - name: Checkout
         uses: actions/checkout@v3
diff --git a/.github/workflows/test-network-ledger.yaml b/.github/workflows/test-network-ledger.yaml
index 1ac6327a..28690d75 100644
--- a/.github/workflows/test-network-ledger.yaml
+++ b/.github/workflows/test-network-ledger.yaml
@@ -17,7 +17,7 @@ concurrency:
 
 jobs:
   basic:
-    runs-on: ubuntu-20.04
+    runs-on: fabric-ubuntu-20.04
     strategy:
       matrix:
         chaincode-language:
diff --git a/.github/workflows/test-network-off-chain.yaml b/.github/workflows/test-network-off-chain.yaml
index 80a3d077..6bf56d11 100644
--- a/.github/workflows/test-network-off-chain.yaml
+++ b/.github/workflows/test-network-off-chain.yaml
@@ -17,7 +17,7 @@ concurrency:
 
 jobs:
   off-chain:
-    runs-on: ubuntu-20.04
+    runs-on: fabric-ubuntu-20.04
     strategy:
       matrix:
         chaincode-language:
diff --git a/.github/workflows/test-network-private.yaml b/.github/workflows/test-network-private.yaml
index a7ea38df..15549688 100644
--- a/.github/workflows/test-network-private.yaml
+++ b/.github/workflows/test-network-private.yaml
@@ -17,7 +17,7 @@ concurrency:
 
 jobs:
   private:
-    runs-on: ubuntu-20.04
+    runs-on: fabric-ubuntu-20.04
     strategy:
       matrix:
         chaincode-language:
diff --git a/.github/workflows/test-network-sbe.yaml b/.github/workflows/test-network-sbe.yaml
index a49b2949..1a7f769e 100644
--- a/.github/workflows/test-network-sbe.yaml
+++ b/.github/workflows/test-network-sbe.yaml
@@ -17,7 +17,7 @@ concurrency:
 
 jobs:
   SBE:
-    runs-on: ubuntu-20.04
+    runs-on: fabric-ubuntu-20.04
     strategy:
       matrix:
         chaincode-language:
diff --git a/.github/workflows/test-network-secured.yaml b/.github/workflows/test-network-secured.yaml
index 8a9f6f47..4eafe7a7 100644
--- a/.github/workflows/test-network-secured.yaml
+++ b/.github/workflows/test-network-secured.yaml
@@ -17,7 +17,7 @@ concurrency:
 
 jobs:
   secured:
-    runs-on: ubuntu-20.04
+    runs-on: fabric-ubuntu-20.04
     strategy:
       matrix:
         chaincode-language: