diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index a0780451c5e..11596e5396a 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -45,6 +45,9 @@ jobs:
         name: tools_ci_sh
         run: ./tools/ci.sh
   get-affected-packages-from-diff:
+    env:
+      RUN_CI_FOR_AFFECTED_PACKAGES_FROM_DIFF_ENABLED: true
+      CI_SKIP_BASED_ON_DIFF_DISABLED: true
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v3.1.0
@@ -71,13 +74,13 @@ jobs:
       - name: Run optimized cli script
         id: get-affected-packages-from-diff
         run: |
-          OPTIMIZED_CI_OUTPUT="$(node tools/get-affected-packages-from-diff.js ${{ steps.changed-files.outputs.all_changed_files }})"
-          echo "OPTIMIZED_CI_OUTPUT=$OPTIMIZED_CI_OUTPUT" >> "$GITHUB_OUTPUT"
+          AFFECTED_PACKAGES="$(node tools/get-affected-packages-from-diff.js ${{ steps.changed-files.outputs.all_changed_files }})"
+          echo "AFFECTED_PACKAGES=$AFFECTED_PACKAGES" >> "$GITHUB_OUTPUT"
       
       - name: List the changed-files
-        run: echo "The output is ${{ steps.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT }}"
+        run: echo "The output is ${{ steps.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES }}"
     outputs:
-      OPTIMIZED_CI_OUTPUT: ${{ steps.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT }}  
+      AFFECTED_PACKAGES: ${{ steps.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES }}  
   yarn_lint:
     continue-on-error: false
     env:
@@ -233,7 +236,7 @@ jobs:
   api-client:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-     contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-api-client') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+     contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-api-client') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       DEV_BUILD_DISABLED: false
@@ -263,7 +266,7 @@ jobs:
   cmd-api-server:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-cmd-api-server') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-cmd-api-server') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       DEV_BUILD_DISABLED: false
@@ -294,7 +297,7 @@ jobs:
   cmd-socketio-server:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-cmd-socketio-server') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-cmd-socketio-server') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       FULL_BUILD_DISABLED: true
@@ -323,7 +326,7 @@ jobs:
   cactus-common:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-common') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-common') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       DEV_BUILD_DISABLED: false
@@ -353,7 +356,7 @@ jobs:
   cactus-core:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-core') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-core') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       FULL_BUILD_DISABLED: true
@@ -380,7 +383,7 @@ jobs:
   cactus-core-api:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-core-api') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-core-api') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       FULL_BUILD_DISABLED: true
@@ -407,7 +410,7 @@ jobs:
   carbon-accounting-backend:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-example-carbon-accounting-backend') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-example-carbon-accounting-backend') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       FULL_BUILD_DISABLED: true
@@ -435,7 +438,7 @@ jobs:
   carbon-accounting-business-logic-plugin:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-example-carbon-accounting-business-logic-plugin') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-example-carbon-accounting-business-logic-plugin') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       FULL_BUILD_DISABLED: true
@@ -462,7 +465,7 @@ jobs:
   carbon-accounting-frontend:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-example-carbon-accounting-frontend') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-example-carbon-accounting-frontend') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       DEV_BUILD_DISABLED: false
@@ -490,7 +493,7 @@ jobs:
   supply-chain-backend:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-example-supply-chain-backend') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-example-supply-chain-backend') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       FULL_BUILD_DISABLED: true
@@ -518,7 +521,7 @@ jobs:
   supply-chain-business-logic-plugin:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-example-supply-chain-business-logic-plugin') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-example-supply-chain-business-logic-plugin') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       FULL_BUILD_DISABLED: true
@@ -545,7 +548,7 @@ jobs:
   supply-chain-frontend:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-example-supply-chain-frontend') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-example-supply-chain-frontend') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       DEV_BUILD_DISABLED: false
@@ -573,7 +576,7 @@ jobs:
   consortium-manual:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-plugin-consortium-manual') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-plugin-consortium-manual') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       FULL_BUILD_DISABLED: true
@@ -600,7 +603,7 @@ jobs:
   htlc-coordinator-besu:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-plugin-htlc-coordinator-besu') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-plugin-htlc-coordinator-besu') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       FULL_BUILD_DISABLED: true
@@ -629,7 +632,7 @@ jobs:
   htlc-eth-besu:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-plugin-htlc-eth-besu') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-plugin-htlc-eth-besu') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       FULL_BUILD_DISABLED: true
@@ -656,7 +659,7 @@ jobs:
   htlc-eth-besu-erc20:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-plugin-htlc-eth-besu-erc20') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-plugin-htlc-eth-besu-erc20') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       FULL_BUILD_DISABLED: true
@@ -683,7 +686,7 @@ jobs:
   keychain-aws-sm:
     needs: [get-affected-packages-from-diff, build-dev]
     if: | 
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-plugin-keychain-aws-sm') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-plugin-keychain-aws-sm') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       FULL_BUILD_DISABLED: true
@@ -711,7 +714,7 @@ jobs:
   keychain-azure-kv:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-plugin-keychain-azure-kv') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-plugin-keychain-azure-kv') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       FULL_BUILD_DISABLED: true
@@ -739,7 +742,7 @@ jobs:
   keychain-google-sm:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-plugin-keychain-google-sm') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-plugin-keychain-google-sm') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       FULL_BUILD_DISABLED: true
@@ -767,7 +770,7 @@ jobs:
   keychain-memory:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-plugin-keychain-memory') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-plugin-keychain-memory') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       FULL_BUILD_DISABLED: true
@@ -794,7 +797,7 @@ jobs:
   keychain-memory-wasm:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-plugin-keychain-memory-wasm') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-plugin-keychain-memory-wasm') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       FULL_BUILD_DISABLED: true
@@ -822,7 +825,7 @@ jobs:
   keychain-vault:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-plugin-keychain-vault') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-plugin-keychain-vault') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       FULL_BUILD_DISABLED: true
@@ -850,7 +853,7 @@ jobs:
   connector-besu:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-plugin-ledger-connector-besu') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-plugin-ledger-connector-besu') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       FULL_BUILD_DISABLED: true
@@ -879,7 +882,7 @@ jobs:
   connector-corda:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-plugin-ledger-connector-corda') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-plugin-ledger-connector-corda') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       FULL_BUILD_DISABLED: true
@@ -909,7 +912,7 @@ jobs:
   connector-fabric-0:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-plugin-ledger-connector-fabric') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-plugin-ledger-connector-fabric') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       CACTI_NPM_PACKAGE_NAME: "@hyperledger/cactus-plugin-ledger-connector-fabric"
@@ -940,7 +943,7 @@ jobs:
   connector-fabric-1:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-plugin-ledger-connector-fabric') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-plugin-ledger-connector-fabric') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       CACTI_NPM_PACKAGE_NAME: "@hyperledger/cactus-plugin-ledger-connector-fabric"
@@ -972,7 +975,7 @@ jobs:
   connector-fabric-2:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-plugin-ledger-connector-fabric') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-plugin-ledger-connector-fabric') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       CACTI_NPM_PACKAGE_NAME: "@hyperledger/cactus-plugin-ledger-connector-fabric"
@@ -1004,7 +1007,7 @@ jobs:
   connector-fabric-3:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-plugin-ledger-connector-fabric') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-plugin-ledger-connector-fabric') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       CACTI_NPM_PACKAGE_NAME: "@hyperledger/cactus-plugin-ledger-connector-fabric"
@@ -1036,7 +1039,7 @@ jobs:
   connector-fabric-4:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-plugin-ledger-connector-fabric') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-plugin-ledger-connector-fabric') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       CACTI_NPM_PACKAGE_NAME: "@hyperledger/cactus-plugin-ledger-connector-fabric"
@@ -1068,7 +1071,7 @@ jobs:
   connector-fabric-5:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-plugin-ledger-connector-fabric') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-plugin-ledger-connector-fabric') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       CACTI_NPM_PACKAGE_NAME: "@hyperledger/cactus-plugin-ledger-connector-fabric"
@@ -1100,7 +1103,7 @@ jobs:
   connector-fabric-6:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-plugin-ledger-connector-fabric') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-plugin-ledger-connector-fabric') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       CACTI_NPM_PACKAGE_NAME: "@hyperledger/cactus-plugin-ledger-connector-fabric"
@@ -1132,7 +1135,7 @@ jobs:
   connector-fabric-7:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-plugin-ledger-connector-fabric') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-plugin-ledger-connector-fabric') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       CACTI_NPM_PACKAGE_NAME: "@hyperledger/cactus-plugin-ledger-connector-fabric"
@@ -1164,7 +1167,7 @@ jobs:
   connector-fabric-8:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-plugin-ledger-connector-fabric') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-plugin-ledger-connector-fabric') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       CACTI_NPM_PACKAGE_NAME: "@hyperledger/cactus-plugin-ledger-connector-fabric"
@@ -1196,7 +1199,7 @@ jobs:
   connector-fabric-9:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-plugin-ledger-connector-fabric') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-plugin-ledger-connector-fabric') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       CACTI_NPM_PACKAGE_NAME: "@hyperledger/cactus-plugin-ledger-connector-fabric"
@@ -1228,7 +1231,7 @@ jobs:
   connector-fabric-10:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-plugin-ledger-connector-fabric') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-plugin-ledger-connector-fabric') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       CACTI_NPM_PACKAGE_NAME: "@hyperledger/cactus-plugin-ledger-connector-fabric"
@@ -1260,7 +1263,7 @@ jobs:
   connector-fabric-11:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-plugin-ledger-connector-fabric') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-plugin-ledger-connector-fabric') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       CACTI_NPM_PACKAGE_NAME: "@hyperledger/cactus-plugin-ledger-connector-fabric"
@@ -1292,7 +1295,7 @@ jobs:
   connector-fabric-12:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-plugin-ledger-connector-fabric') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-plugin-ledger-connector-fabric') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       CACTI_NPM_PACKAGE_NAME: "@hyperledger/cactus-plugin-ledger-connector-fabric"
@@ -1324,7 +1327,7 @@ jobs:
   connector-fabric-socketio:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-plugin-ledger-connector-fabric-socketio') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-plugin-ledger-connector-fabric-socketio') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       FULL_BUILD_DISABLED: true
@@ -1353,7 +1356,7 @@ jobs:
   connector-go-ethereum-socketio:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-plugin-ledger-connector-go-ethereum-socketio') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-plugin-ledger-connector-go-ethereum-socketio') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       DEV_BUILD_DISABLED: false
@@ -1381,7 +1384,7 @@ jobs:
   connector-iroha:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-plugin-ledger-connector-iroha') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-plugin-ledger-connector-iroha') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       FULL_BUILD_DISABLED: true
@@ -1410,7 +1413,7 @@ jobs:
   connector-iroha2:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-plugin-ledger-connector-iroha2') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-plugin-ledger-connector-iroha2') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       FULL_BUILD_DISABLED: true
@@ -1437,7 +1440,7 @@ jobs:
   connector-ethereum:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-plugin-ledger-connector-ethereum') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-plugin-ledger-connector-ethereum') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       FULL_BUILD_DISABLED: true
@@ -1468,7 +1471,7 @@ jobs:
   connector-quorum:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-plugin-ledger-connector-quorum') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-plugin-ledger-connector-quorum') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       FULL_BUILD_DISABLED: true
@@ -1497,7 +1500,7 @@ jobs:
   connector-sawtooth-socketio:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-plugin-ledger-connector-sawtooth-socketio') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-plugin-ledger-connector-sawtooth-socketio') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       DEV_BUILD_DISABLED: false
@@ -1525,7 +1528,7 @@ jobs:
   connector-xdai:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-plugin-ledger-connector-xdai') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-plugin-ledger-connector-xdai') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       FULL_BUILD_DISABLED: true
@@ -1554,7 +1557,7 @@ jobs:
   persistence-ethereum:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-plugin-persistence-ethereum') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-plugin-persistence-ethereum') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       FULL_BUILD_DISABLED: true
@@ -1581,7 +1584,7 @@ jobs:
   object-store-ipfs:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-plugin-object-store-ipfs') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-plugin-object-store-ipfs') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       FULL_BUILD_DISABLED: true
@@ -1609,8 +1612,8 @@ jobs:
   # cactus-plugin-odap-hermes:
   #   needs: [get-affected-packages-from-diff, build-dev]
   #   if: |
-  #     contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-plugin-odap-hermes') \
-  #     && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+  #     contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-plugin-odap-hermes') \
+  #     && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
   #   continue-on-error: false
   #   env:
   #     FULL_BUILD_DISABLED: true
@@ -1639,7 +1642,7 @@ jobs:
   connector-ubiquity:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-plugin-connector-ubiquity') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-plugin-connector-ubiquity') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       FULL_BUILD_DISABLED: true
@@ -1669,7 +1672,7 @@ jobs:
   test-api-client:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-test-api-client') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-test-api-client') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       FULL_BUILD_DISABLED: true
@@ -1696,7 +1699,7 @@ jobs:
   test-cmd-api-server:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-test-cmd-api-server') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-test-cmd-api-server') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       FULL_BUILD_DISABLED: true
@@ -1724,7 +1727,7 @@ jobs:
   test-plugin-consortium-manual:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-test-plugin-consortium-manual') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-test-plugin-consortium-manual') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       FULL_BUILD_DISABLED: true
@@ -1752,7 +1755,7 @@ jobs:
   test-plugin-htlc-eth-besu:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-test-plugin-htlc-eth-besu') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-test-plugin-htlc-eth-besu') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       FULL_BUILD_DISABLED: true
@@ -1787,7 +1790,7 @@ jobs:
   test-plugin-htlc-eth-besu-erc20:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-test-plugin-htlc-eth-besu-erc20') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-test-plugin-htlc-eth-besu-erc20') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       FULL_BUILD_DISABLED: true
@@ -1816,7 +1819,7 @@ jobs:
   test-plugin-ledger-connector-besu:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-test-plugin-ledger-connector-besu') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-test-plugin-ledger-connector-besu') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       FULL_BUILD_DISABLED: true
@@ -1845,7 +1848,7 @@ jobs:
   test-plugin-ledger-connector-quorum:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-test-plugin-ledger-connector-quorum') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-test-plugin-ledger-connector-quorum') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       FULL_BUILD_DISABLED: true
@@ -1872,7 +1875,7 @@ jobs:
   test-plugin-ledger-connector-ethereum:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-test-plugin-ledger-connector-ethereum') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-test-plugin-ledger-connector-ethereum') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       FULL_BUILD_DISABLED: true
@@ -1901,7 +1904,7 @@ jobs:
   test-tooling:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-test-tooling') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-test-tooling') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       FULL_BUILD_DISABLED: true
@@ -1930,7 +1933,7 @@ jobs:
   verifier-client:
     needs: [get-affected-packages-from-diff, build-dev]
     if: |
-      contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'cactus-verifier-client') && contains(needs.get-affected-packages-from-diff.outputs.OPTIMIZED_CI_OUTPUT, 'true') 
+      contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'cactus-verifier-client') && contains(needs.get-affected-packages-from-diff.outputs.AFFECTED_PACKAGES, 'true') 
     continue-on-error: false
     env:
       FULL_BUILD_DISABLED: true
diff --git a/tools/get-affected-packages-from-diff.js b/tools/get-affected-packages-from-diff.js
index 3e2efed6fb6..2ed2e214ccd 100644
--- a/tools/get-affected-packages-from-diff.js
+++ b/tools/get-affected-packages-from-diff.js
@@ -2,8 +2,8 @@ import { execSync } from "child_process";
 import { existsSync, readFileSync } from "fs";
 import { NpmExtractor } from "@h4ad/dependency-extractor";
 
-// this function generates a list of packages, extensions and examples which need to be
-// tested by the CI due to a given git diff
+// this function generates a list of packages, extensions and examples for which
+// the CI needs to run due to a given git diff
 async function packagesExtensionsAndExamplesAffectedByDiff(gitDiffFilePaths) {
   let uniquePackagesExtensionsAndExamplesAffectedByDiff = new Set();
   const dependencyGraph = await generateDependencyGraph();
@@ -230,10 +230,10 @@ function checkIfNoDiff(filePaths) {
 }
 
 // return true when diff exists and contains only markdown file changes
-function checkIfCiNeedsToRunForDiff(filePaths) {
-  let ciNeedsToRunForDiff = false;
+function CiSkipBasedOnDiffDisabled(filePaths) {
+  let ciSkipBasedOnDiffDisabled = false;
   if (!checkIfNoDiff(filePaths)) {
-    ciNeedsToRunForDiff = false;
+    ciSkipBasedOnDiffDisabled = false;
     filePaths.forEach((filePath) => {
       const fileExtension = filePath.substring(
         filePath.lastIndexOf(".") + 1,
@@ -246,11 +246,11 @@ function checkIfCiNeedsToRunForDiff(filePaths) {
           filePath != "yarn.lock" &&
           filePath != "tools/optimize-ci.js"
         )
-          ciNeedsToRunForDiff = true;
+          ciSkipBasedOnDiffDisabled = true;
       }
     });
   }
-  return ciNeedsToRunForDiff;
+  return ciSkipBasedOnDiffDisabled;
 }
 
 // return string[] containing all the filepaths in git diff with main branch
@@ -262,49 +262,70 @@ function checkIfCiNeedsToRunForDiff(filePaths) {
 //   'packages/cactus-cmd-socketio-server/test4.txt',
 // ]
 function getGitDiff() {
-  // uncomment the below commented lines if you want to test this locally
+  // uncomment the below commented lines if you want to test this script locally
   // const cliCommand = "git diff origin/main --name-only";
   // return execSync(cliCommand).toString("utf-8").split("\n").sort().splice(1);
 
-  // comment these lines if you want to test the CI
+  // comment these lines if you want to test the script from the ci
   const commaSeperatedDiffFiles = process.argv[2];
   return commaSeperatedDiffFiles.split(",");
 }
 
 // ------------------------------------------------------------------------------------------------
 
-let optimizedCliOutput = new Map();
+// CI related env variables
 
-// getting the git diff
-const gitDiffFilePaths = getGitDiff();
+// this field should be set as true to enable selective CI run based on diff
+const RUN_CI_FOR_AFFECTED_PACKAGES_FROM_DIFF_ENABLED =
+  process.env.RUN_CI_FOR_AFFECTED_PACKAGES_FROM_DIFF_ENABLED;
 
-// checking if its a documentation PR
-// TODO: Update this task to work on docs/ folder of packages
-// instead of checking for .md files
-optimizedCliOutput.set(
-  "ciNeedsToRunForDiff",
-  checkIfCiNeedsToRunForDiff(gitDiffFilePaths),
-);
+// this field should be set as true to get the list of affected packages
+// setting this false returns an empty array in case we want to disable the
+// package testing/building with just a job level env variable
+const CI_SKIP_BASED_ON_DIFF_DISABLED =
+  process.env.CI_SKIP_BASED_ON_DIFF_DISABLED;
 
-// printing a list of all packages which need to be tested by CI as they are affected
-optimizedCliOutput.set(
-  "affectedPluginsExamplesAndExtensions",
-  await packagesExtensionsAndExamplesAffectedByDiff(gitDiffFilePaths),
-);
+let getAffectedPackagesFromDiff = new Map();
 
-// This outputs something like
-// {
-//   "ciNeedsToRunForDiff": true,
-//   "affectedPluginsExamplesAndExtensions": [
-//     "cactus-cmd-api-server",
-//     "cactus-plugin-htlc-coordinator-besu",
-//     "cactus-plugin-object-store-ipfs",
-//     "cactus-example-carbon-accounting-business-logic-plugin",
-//     "cactus-example-carbon-accounting-frontend",
-//     "cactus-example-supply-chain-business-logic-plugin",
-//     "cactus-example-supply-chain-frontend",
-//     "cactus-check-connection-ethereum-validator",
-//     "cactus-example-supply-chain-backend"
-//   ]
-// }
-console.log(JSON.stringify(Object.fromEntries(optimizedCliOutput)));
+if (CI_SKIP_BASED_ON_DIFF_DISABLED == "false") {
+  getAffectedPackagesFromDiff.set("ciSkipBasedOnDiffDisabled", false);
+  getAffectedPackagesFromDiff.set("affectedPluginsExamplesAndExtensions", []);
+} else {
+  if (RUN_CI_FOR_AFFECTED_PACKAGES_FROM_DIFF_ENABLED == "true") {
+    // getting the git diff
+    const gitDiffFilePaths = getGitDiff();
+    getAffectedPackagesFromDiff.set(
+      "ciSkipBasedOnDiffDisabled",
+      CiSkipBasedOnDiffDisabled(gitDiffFilePaths),
+    );
+    // printing a list of all packages which need to be tested by CI as they are affected
+    getAffectedPackagesFromDiff.set(
+      "affectedPluginsExamplesAndExtensions",
+      await packagesExtensionsAndExamplesAffectedByDiff(gitDiffFilePaths),
+    );
+  } else {
+    getAffectedPackagesFromDiff.set("ciSkipBasedOnDiffDisabled", true);
+    getAffectedPackagesFromDiff.set(
+      "affectedPluginsExamplesAndExtensions",
+      getAllCactusExamples() +
+        getAllCactusExtensions() +
+        getAllCactusPackages(),
+    );
+  }
+  // This outputs something like
+  // {
+  //   "ciSkipBasedOnDiffDisabled": true,
+  //   "affectedPluginsExamplesAndExtensions": [
+  //     "cactus-cmd-api-server",
+  //     "cactus-plugin-htlc-coordinator-besu",
+  //     "cactus-plugin-object-store-ipfs",
+  //     "cactus-example-carbon-accounting-business-logic-plugin",
+  //     "cactus-example-carbon-accounting-frontend",
+  //     "cactus-example-supply-chain-business-logic-plugin",
+  //     "cactus-example-supply-chain-frontend",
+  //     "cactus-check-connection-ethereum-validator",
+  //     "cactus-example-supply-chain-backend"
+  //   ]
+  // }
+}
+console.log(JSON.stringify(Object.fromEntries(getAffectedPackagesFromDiff)));