diff --git a/.github/workflows/soroban-rpc.yml b/.github/workflows/soroban-rpc.yml
index bc7ed064..637875e2 100644
--- a/.github/workflows/soroban-rpc.yml
+++ b/.github/workflows/soroban-rpc.yml
@@ -98,16 +98,14 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-20.04, ubuntu-22.04 ]
-        protocol-version: [ 20, 21 ]
+        protocol-version: [ 21 ]
     runs-on: ${{ matrix.os }}
     env:
       SOROBAN_RPC_INTEGRATION_TESTS_ENABLED: true
       SOROBAN_RPC_INTEGRATION_TESTS_CORE_MAX_SUPPORTED_PROTOCOL: ${{ matrix.protocol-version }}
       SOROBAN_RPC_INTEGRATION_TESTS_CAPTIVE_CORE_BIN: /usr/bin/stellar-core
-      PROTOCOL_20_CORE_DEBIAN_PKG_VERSION: 21.1.0-1909.rc1.b3aeb14cc.focal
-      PROTOCOL_20_CORE_DOCKER_IMG: stellar/stellar-core:21.1.0-1909.rc1.b3aeb14cc.focal
-      PROTOCOL_21_CORE_DEBIAN_PKG_VERSION: 21.1.0-1909.rc1.b3aeb14cc.focal
-      PROTOCOL_21_CORE_DOCKER_IMG: stellar/stellar-core:21.1.0-1909.rc1.b3aeb14cc.focal
+      PROTOCOL_21_CORE_DEBIAN_PKG_VERSION: 21.3.1-2006.4ede19620.focal
+      PROTOCOL_21_CORE_DOCKER_IMG: stellar/unsafe-stellar-core:21.3.1-2006.4ede19620.focal
     steps:
       - uses: actions/checkout@v4
         with:
diff --git a/cmd/soroban-rpc/internal/integrationtest/upgrade_test.go b/cmd/soroban-rpc/internal/integrationtest/upgrade_test.go
index efd26cb2..5804e34d 100644
--- a/cmd/soroban-rpc/internal/integrationtest/upgrade_test.go
+++ b/cmd/soroban-rpc/internal/integrationtest/upgrade_test.go
@@ -13,20 +13,22 @@ import (
 	"github.com/stellar/soroban-rpc/cmd/soroban-rpc/internal/integrationtest/infrastructure"
 )
 
-func TestUpgradeFrom20To21(t *testing.T) {
-	if infrastructure.GetCoreMaxSupportedProtocol() != 21 {
-		t.Skip("Only test this for protocol 21")
+func TestUpgradeFrom20To22(t *testing.T) {
+	if infrastructure.GetCoreMaxSupportedProtocol() != 22 {
+		t.Skip("Only test this for protocol 22")
 	}
 	test := infrastructure.NewTest(t, &infrastructure.TestConfig{
-		ProtocolVersion: 20,
+		ProtocolVersion: 21,
 	})
 
 	test.UploadHelloWorldContract()
 
-	// Upgrade to protocol 21 and re-upload the contract, which should cause a caching of the contract
-	// estimations
-	test.UpgradeProtocol(21)
-	// Wait for the ledger to advance, so that the simulation library passes the right protocol number
+	// Upgrade to protocol 21 and re-upload the contract, which should cause a
+	// caching of the contract estimations
+	test.UpgradeProtocol(22)
+
+	// Wait for the ledger to advance, so that the simulation library passes the
+	// right protocol number
 	rpcDB := test.GetDaemon().GetDB()
 	initialLedgerSequence, err := db.NewLedgerEntryReader(rpcDB).GetLatestLedgerSequence(context.Background())
 	require.NoError(t, err)