diff --git a/.github/workflows/soroban-rpc.yml b/.github/workflows/soroban-rpc.yml
index 2aeb9e8d..6937a369 100644
--- a/.github/workflows/soroban-rpc.yml
+++ b/.github/workflows/soroban-rpc.yml
@@ -113,10 +113,10 @@ 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_20_CORE_DEBIAN_PKG_VERSION: 21.0.0-1812.rc1.a10329cca.focal
-      PROTOCOL_20_CORE_DOCKER_IMG: stellar/unsafe-stellar-core:21.0.0-1812.rc1.a10329cca.focal
-      PROTOCOL_21_CORE_DEBIAN_PKG_VERSION: 21.0.0-1812.rc1.a10329cca.focal
-      PROTOCOL_21_CORE_DOCKER_IMG: stellar/unsafe-stellar-core:21.0.0-1812.rc1.a10329cca.focal
+      PROTOCOL_20_CORE_DEBIAN_PKG_VERSION: 21.0.0-1865.rc2.c6f474133.focal
+      PROTOCOL_20_CORE_DOCKER_IMG: stellar/unsafe-stellar-core:21.0.0-1865.rc2.c6f474133.focal
+      PROTOCOL_21_CORE_DEBIAN_PKG_VERSION: 21.0.0-1865.rc2.c6f474133.focal
+      PROTOCOL_21_CORE_DOCKER_IMG: stellar/unsafe-stellar-core:21.0.0-1865.rc2.c6f474133.focal
     steps:
       - uses: actions/checkout@v3
         with:
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 00000000..41c5632c
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,43 @@
+# Changelog 
+
+## Unreleased
+n/a
+
+
+## [v21.1.0](https://github.com/stellar/soroban-rpc/compare/v21.0.1...v21.1.0)
+
+### Added
+* A new `getVersionInfo` RPC endpoint providing versioning info ([#132](https://github.com/stellar/soroban-rpc/pull/132)):
+
+```typescript
+interface getVersionInfo {
+  version: string;
+  commit_hash: string;
+  build_time_stamp: string;
+  captive_core_version: string;
+  protocol_version: number; // uint32
+}
+```
+
+### Fixed
+* Deadlock on events ingestion error ([#167](https://github.com/stellar/soroban-rpc/pull/167)). 
+* Correctly report row iteration errors in `StreamAllLedgers` ([#168](https://github.com/stellar/soroban-rpc/pull/168)). 
+* Increase default ingestion timeout ([#169](https://github.com/stellar/soroban-rpc/pull/169)). 
+* Surface an ignored error in `getRawLedgerEntries()` ([#170](https://github.com/stellar/soroban-rpc/pull/170)). 
+
+
+# Formatting Guidelines
+
+This outlines the formatting expectations for the CHANGELOG.md file.
+
+## [vMajor.Minor.Patch](GitHub compare diff to last version)
+If necessary, drop a summary here (e.g. "This release supports Protocol 420.")
+
+### Breaking Changes come first
+* This is a pull request description and it should be quite detailed if it's a breaking change. Ideally, you would even include a bit of helpful notes on how to migrate/upgrade if that's necessary. For example, if an API changes, you should provide deep detail on the delta.
+
+### Added stuff next
+* Anything added should have a details on its schema or command line arguments ([#NNNN](link to github pr)).
+
+### Fixed bugs last
+* Be sure you describe who is affected and how.
diff --git a/cmd/soroban-rpc/internal/daemon/daemon.go b/cmd/soroban-rpc/internal/daemon/daemon.go
index b09a948d..0e273f69 100644
--- a/cmd/soroban-rpc/internal/daemon/daemon.go
+++ b/cmd/soroban-rpc/internal/daemon/daemon.go
@@ -109,6 +109,7 @@ func newCaptiveCore(cfg *config.Config, logger *supportlog.Entry) (*ledgerbacken
 		Strict:                         true,
 		UseDB:                          true,
 		EnforceSorobanDiagnosticEvents: true,
+		CoreBinaryPath:                 cfg.StellarCoreBinaryPath,
 	}
 	captiveCoreToml, err := ledgerbackend.NewCaptiveCoreTomlFromFile(cfg.CaptiveCoreConfigPath, captiveCoreTomlParams)
 	if err != nil {
diff --git a/cmd/soroban-rpc/internal/test/docker-compose.yml b/cmd/soroban-rpc/internal/test/docker-compose.yml
index afe214a9..ebb41af6 100644
--- a/cmd/soroban-rpc/internal/test/docker-compose.yml
+++ b/cmd/soroban-rpc/internal/test/docker-compose.yml
@@ -15,7 +15,7 @@ services:
     # Note: Please keep the image pinned to an immutable tag matching the Captive Core version.
     #       This avoids implicit updates which break compatibility between
     #       the Core container and captive core.
-    image: ${CORE_IMAGE:-stellar/unsafe-stellar-core:20.4.1-1807.b152dc51d.focal}
+    image: ${CORE_IMAGE:-stellar/stellar-core:21.0.0-1865.rc2.c6f474133.focal}
     depends_on:
       - core-postgres
     restart: on-failure
diff --git a/cmd/soroban-rpc/internal/test/stellar-core-integration-tests.cfg b/cmd/soroban-rpc/internal/test/stellar-core-integration-tests.cfg
index c194dbae..5462dbfb 100644
--- a/cmd/soroban-rpc/internal/test/stellar-core-integration-tests.cfg
+++ b/cmd/soroban-rpc/internal/test/stellar-core-integration-tests.cfg
@@ -1,5 +1,6 @@
 ARTIFICIALLY_ACCELERATE_TIME_FOR_TESTING=true
 ENABLE_DIAGNOSTICS_FOR_TX_SUBMISSION=true
+DEPRECATED_SQL_LEDGER_STATE=false
 
 NETWORK_PASSPHRASE="Standalone Network ; February 2017"