diff --git a/.github/workflows/soroban-rpc.yml b/.github/workflows/soroban-rpc.yml
index 43c588a1..375f7584 100644
--- a/.github/workflows/soroban-rpc.yml
+++ b/.github/workflows/soroban-rpc.yml
@@ -104,8 +104,8 @@ jobs:
       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_21_CORE_DEBIAN_PKG_VERSION: 22.0.0-2095.rc2.1bccbc921.focal
-      PROTOCOL_21_CORE_DOCKER_IMG: stellar/stellar-core:22.0.0-2095.rc2.1bccbc921.focal
+      PROTOCOL_21_CORE_DEBIAN_PKG_VERSION: 21.3.1-2007.4ede19620.focal
+      PROTOCOL_21_CORE_DOCKER_IMG: stellar/stellar-core:21.3.1-2007.4ede19620.focal
       PROTOCOL_22_CORE_DEBIAN_PKG_VERSION: 22.0.0-2095.rc2.1bccbc921.focal
       PROTOCOL_22_CORE_DOCKER_IMG: stellar/stellar-core:22.0.0-2095.rc2.1bccbc921.focal
 
diff --git a/cmd/soroban-rpc/internal/integrationtest/migrate_test.go b/cmd/soroban-rpc/internal/integrationtest/migrate_test.go
index a12eae86..b91ab201 100644
--- a/cmd/soroban-rpc/internal/integrationtest/migrate_test.go
+++ b/cmd/soroban-rpc/internal/integrationtest/migrate_test.go
@@ -23,8 +23,9 @@ func TestMigrate(t *testing.T) {
 	}
 	for _, originVersion := range getCurrentProtocolReleasedVersions(t) {
 		if originVersion == "21.1.0" {
-			// This version of the RPC container fails to even start with its captive core companion file
-			// (it fails Invalid configuration: DEPRECATED_SQL_LEDGER_STATE not set.)
+			// This version of the RPC container fails to even start with its
+			// captive core companion file (it fails Invalid configuration:
+			// DEPRECATED_SQL_LEDGER_STATE not set.)
 			continue
 		}
 		if originVersion == "21.3.0" {
@@ -32,8 +33,8 @@ func TestMigrate(t *testing.T) {
 			continue
 		}
 		if originVersion == "22.0.0-rc2" {
-			// This version of RPC wasn't published without a deb build number suffix.
-			originVersion = "22.0.0-rc2-100"
+			// This version of RPC has something wrong with its docker container
+			continue
 		}
 		t.Run(originVersion, func(t *testing.T) {
 			testMigrateFromVersion(t, originVersion)
@@ -51,8 +52,9 @@ func testMigrateFromVersion(t *testing.T, version string) {
 	// Submit an event-logging transaction in the version to migrate from
 	submitTransactionResponse, _ := test.UploadHelloWorldContract()
 
-	// Replace RPC with the current version, but keeping the previous network and sql database (causing any data migrations)
-	// We need to do some wiring to plug RPC into the prior network
+	// Replace RPC with the current version, but keeping the previous network
+	// and sql database (causing any data migrations) We need to do some wiring
+	// to plug RPC into the prior network
 	test.StopRPC()
 	corePorts := test.GetPorts().TestCorePorts
 	test = infrastructure.NewTest(t, &infrastructure.TestConfig{