diff --git a/Makefile b/Makefile
index a62d515dc..c49fd394e 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ console:
 build-latest:
 	$(MAKE) build TAG=latest \
 		XDR_REF=v20.0.2 \
-		CORE_REF=v20.0.2 \
+		CORE_REF=v20.1.0 \
 		CORE_SUPPORTS_ENABLE_SOROBAN_DIAGNOSTIC_EVENTS=true \
 		HORIZON_REF=horizon-v2.27.0 \
 		SOROBAN_RPC_REF=v20.1.0
@@ -32,7 +32,7 @@ build-latest:
 build-testing:
 	$(MAKE) build TAG=testing \
 		XDR_REF=v20.0.2 \
-		CORE_REF=v20.0.2 \
+		CORE_REF=v20.1.0 \
 		CORE_SUPPORTS_ENABLE_SOROBAN_DIAGNOSTIC_EVENTS=true \
 		HORIZON_REF=horizon-v2.27.0 \
 		SOROBAN_RPC_REF=v20.1.0
@@ -40,7 +40,7 @@ build-testing:
 build-soroban-dev:
 	$(MAKE) build TAG=soroban-dev \
 		XDR_REF=v20.0.2 \
-		CORE_REF=v20.0.2 \
+		CORE_REF=v20.1.0 \
 		CORE_SUPPORTS_ENABLE_SOROBAN_DIAGNOSTIC_EVENTS=true \
 		HORIZON_REF=horizon-v2.27.0 \
 		SOROBAN_RPC_REF=v20.1.0
diff --git a/local/core/etc/config-settings/testnet.json b/local/core/etc/config-settings/testnet.json
index 895ab7e3f..5f69caf64 100644
--- a/local/core/etc/config-settings/testnet.json
+++ b/local/core/etc/config-settings/testnet.json
@@ -301,7 +301,7 @@
           "temp_rent_rate_denominator": 5356800,
           "max_entries_to_archive": 100,
           "bucket_list_size_window_sample_size": 30,
-          "eviction_scan_size": 100000,
+          "eviction_scan_size": 1048576,
           "starting_eviction_scan_level": 6
       }
     },
diff --git a/local/core/etc/config-settings/unlimited.json b/local/core/etc/config-settings/unlimited.json
index 0446b7f16..b0ebd57c0 100644
--- a/local/core/etc/config-settings/unlimited.json
+++ b/local/core/etc/config-settings/unlimited.json
@@ -24,7 +24,7 @@
                 "fee_read_ledger_entry": 1000,
                 "fee_write_ledger_entry": 3000,
                 "fee_read1_kb": 1000,
-                "bucket_list_target_size_bytes": 2147483648,
+                "bucket_list_target_size_bytes": 2305843009213694000,
                 "write_fee1_kb_bucket_list_low": 1000,
                 "write_fee1_kb_bucket_list_high": 4000000,
                 "bucket_list_write_fee_growth_factor": 1000