diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 896da4fb9f..ac8ec7302c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -35,11 +35,11 @@ jobs:
     strategy:
       matrix:
         specs:
-          - "spec/models"
-          - "spec/lib"
+          #- "spec/models"
+          #- "spec/lib"
           - "spec/migrations"
-          - "spec/serializers"
-          - "engines/*/spec"
+          #- "spec/serializers"
+          #- "engines/*/spec"
       fail-fast: false
     steps:
       - uses: actions/checkout@v3
diff --git a/.github/workflows/build_knapsack_controllers.yml b/.github/workflows/build_knapsack_controllers.yml
index 2147f5c63a..6943af5bec 100644
--- a/.github/workflows/build_knapsack_controllers.yml
+++ b/.github/workflows/build_knapsack_controllers.yml
@@ -42,7 +42,7 @@ jobs:
         ci_node_total: [10]
         # Indexes for parallel jobs (starting from zero).
         # E.g. use [0, 1] for 2 parallel jobs, [0, 1, 2] for 3 parallel jobs, etc.
-        ci_node_index: [1, 2, 3, 4, 5, 6, 7, 8, 9]
+        ci_node_index: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
     steps:
       - uses: actions/checkout@v3
 
@@ -82,7 +82,8 @@ jobs:
           # RSpec split test files by test examples feature - it's optional
           # https://knapsackpro.com/faq/question/how-to-split-slow-rspec-test-files-by-test-examples-by-individual-it
           #KNAPSACK_PRO_RSPEC_SPLIT_BY_TEST_EXAMPLES: true
+          KNAPSACK_PRO_TEST_FILE_PATTERN: "spec/controllers/**/*_spec.rb" 
         
         run: |
-          KNAPSACK_PRO_TEST_FILE_PATTERN="spec/controllers/**/*_spec.rb" bundle exec rake knapsack_pro:rspec
+          bundle exec rake knapsack_pro:rspec
 
diff --git a/.github/workflows/build_knapsack_system.yml b/.github/workflows/build_knapsack_system.yml
index f135d1f182..004f5c2abc 100644
--- a/.github/workflows/build_knapsack_system.yml
+++ b/.github/workflows/build_knapsack_system.yml
@@ -39,11 +39,10 @@ jobs:
         # [n] - where the n is a number of parallel jobs you want to run your tests on.
         # Use a higher number if you have slow tests to split them between more parallel jobs.
         # Remember to update the value of the `ci_node_index` below to (0..n-1).
-        ci_node_total: [40]
+        ci_node_total: [10]
         # Indexes for parallel jobs (starting from zero).
         # E.g. use [0, 1] for 2 parallel jobs, [0, 1, 2] for 3 parallel jobs, etc.
-        ci_node_index: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
-          20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39]
+        ci_node_index: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
     steps:
       - uses: actions/checkout@v3
 
@@ -83,9 +82,10 @@ jobs:
           # RSpec split test files by test examples feature - it's optional
           # https://knapsackpro.com/faq/question/how-to-split-slow-rspec-test-files-by-test-examples-by-individual-it
           #KNAPSACK_PRO_RSPEC_SPLIT_BY_TEST_EXAMPLES: true
+          KNAPSACK_PRO_TEST_FILE_PATTERN: "spec/system/**/*_spec.rb" 
 
         run: |
-          KNAPSACK_PRO_TEST_FILE_PATTERN="spec/system/**/*_spec.rb" bundle exec rake knapsack_pro:rspec
+          bundle exec rake knapsack_pro:rspec
 
       - name: Archive failed tests screenshots
         if: failure()
diff --git a/spec/base_spec_helper.rb b/spec/base_spec_helper.rb
index 4b2d1ebcaf..eec44cf8a7 100644
--- a/spec/base_spec_helper.rb
+++ b/spec/base_spec_helper.rb
@@ -24,11 +24,8 @@ Shoulda::Matchers.configure do |config|
   end
 end
 
-# Configures knapsack_pro if not set otherwise on .github/workflows/build.yml
-unless ENV['DISABLE_KNAPSACK_PRO']
-  require 'knapsack_pro'
-  KnapsackPro::Adapters::RSpecAdapter.bind
-end
+require 'knapsack_pro'
+KnapsackPro::Adapters::RSpecAdapter.bind
 
 # Allow connections to selenium whilst raising errors when connecting to external sites
 require 'webmock/rspec'