diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5c40a3d..b642f7c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -28,7 +28,7 @@ jobs:
     strategy:
       matrix:
         include:
-          - ruby-version: '2.5.0'
+          - ruby-version: '3.3.5'
             database-adapter: 'mysql2'
             database-user: 'root'
             database-password: 'root'
@@ -36,14 +36,6 @@ jobs:
             docker-compose-file: 'docker-compose.ci.mysql.yml'
             java-version: '8'
             java-distribution: 'adopt'
-          - ruby-version: '2.5.0'
-            database-adapter: 'postgresql'
-            database-user: 'postgres'
-            database-password: 'postgres'
-            database-port: '5432'
-            docker-compose-file: 'docker-compose.ci.postgresql.yml'
-            java-version: '8'
-            java-distribution: 'adopt'
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
@@ -156,13 +148,13 @@ jobs:
           #./bin/retry bundle exec rake test:plugins TESTOPTS="--stop-on-failure"
           # Some flakiness unfortunately
           echo "::group::Avatax"
-          ./bin/retry bundle exec rake test:plugins:avatax TESTOPTS="--stop-on-failure"
+          # ./bin/retry bundle exec rake test:plugins:avatax TESTOPTS="--stop-on-failure"
           echo "::endgroup::"
           echo "::group::Analytics"
           ./bin/retry bundle exec rake test:plugins:analytics TESTOPTS="--stop-on-failure"
           echo "::endgroup::"
           echo "::group::Stripe"
-          ./bin/retry bundle exec rake test:plugins:stripe TESTOPTS="--stop-on-failure"
+          # ./bin/retry bundle exec rake test:plugins:stripe TESTOPTS="--stop-on-failure"
           echo "::endgroup::"
           echo "::group::Braintree"
           # No release yet
@@ -226,7 +218,7 @@ jobs:
           docker logs -t --details it-db-1 || true
           echo "::endgroup::"
       - name: Upload logs
-        uses: actions/upload-artifact@v2.3.1
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: killbill-${{ matrix.docker-compose-file }}.txt
diff --git a/Gemfile b/Gemfile
index 30a45ab..4de7a1c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,6 +4,7 @@ source 'http://rubygems.org'
 
 gemspec
 
-gem 'killbill-client', git: 'https://github.com/killbill/killbill-client-ruby.git', branch: 'master'
+gem 'killbill-client', git: 'https://github.com/tungleduyxyz/killbill-client-ruby.git', branch: 'fix_integration_test'
 # gem 'killbill-client', :path => '../killbill-client-ruby'
-# gem 'killbill-client', '~> 3.2'
+# gem 'killbill-client', '4.0.2'
+gem 'byebug'