diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java
index 448f609f397fd..dd5b5deffb51d 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java
@@ -1650,52 +1650,22 @@ private CompletableFuture<ManagedLedgerConfig> getManagedLedgerConfig(@Nonnull T
             managedLedgerConfig.setEnsembleSize(persistencePolicies.getBookkeeperEnsemble());
             managedLedgerConfig.setWriteQuorumSize(persistencePolicies.getBookkeeperWriteQuorum());
             managedLedgerConfig.setAckQuorumSize(persistencePolicies.getBookkeeperAckQuorum());
-
-            if (serviceConfig.isStrictBookieAffinityEnabled()) {
+            if (localPolicies.isPresent() && localPolicies.get().bookieAffinityGroup != null) {
                 managedLedgerConfig.setBookKeeperEnsemblePlacementPolicyClassName(
                         IsolatedBookieEnsemblePlacementPolicy.class);
-                if (localPolicies.isPresent() && localPolicies.get().bookieAffinityGroup != null) {
-                    Map<String, Object> properties = new HashMap<>();
-                    properties.put(IsolatedBookieEnsemblePlacementPolicy.ISOLATION_BOOKIE_GROUPS,
-                            localPolicies.get().bookieAffinityGroup.getBookkeeperAffinityGroupPrimary());
-                    properties.put(IsolatedBookieEnsemblePlacementPolicy.SECONDARY_ISOLATION_BOOKIE_GROUPS,
-                            localPolicies.get().bookieAffinityGroup.getBookkeeperAffinityGroupSecondary());
-                    managedLedgerConfig.setBookKeeperEnsemblePlacementPolicyProperties(properties);
-                } else if (isSystemTopic(topicName)) {
-                    Map<String, Object> properties = new HashMap<>();
-                    properties.put(IsolatedBookieEnsemblePlacementPolicy.ISOLATION_BOOKIE_GROUPS, "*");
-                    properties.put(IsolatedBookieEnsemblePlacementPolicy
-                            .SECONDARY_ISOLATION_BOOKIE_GROUPS, "*");
-                    managedLedgerConfig.setBookKeeperEnsemblePlacementPolicyProperties(properties);
-                } else {
-                    Map<String, Object> properties = new HashMap<>();
-                    properties.put(IsolatedBookieEnsemblePlacementPolicy.ISOLATION_BOOKIE_GROUPS, "");
-                    properties.put(IsolatedBookieEnsemblePlacementPolicy.SECONDARY_ISOLATION_BOOKIE_GROUPS, "");
-                    managedLedgerConfig.setBookKeeperEnsemblePlacementPolicyProperties(properties);
-                }
-            } else {
-                if (localPolicies.isPresent() && localPolicies.get().bookieAffinityGroup != null) {
-                    managedLedgerConfig.setBookKeeperEnsemblePlacementPolicyClassName(
-                            IsolatedBookieEnsemblePlacementPolicy.class);
-                    Map<String, Object> properties = new HashMap<>();
-                    properties.put(IsolatedBookieEnsemblePlacementPolicy.ISOLATION_BOOKIE_GROUPS,
-                            localPolicies.get().bookieAffinityGroup.getBookkeeperAffinityGroupPrimary());
-                    properties.put(IsolatedBookieEnsemblePlacementPolicy.SECONDARY_ISOLATION_BOOKIE_GROUPS,
-                            localPolicies.get().bookieAffinityGroup.getBookkeeperAffinityGroupSecondary());
-                    managedLedgerConfig.setBookKeeperEnsemblePlacementPolicyProperties(properties);
-                }
+                Map<String, Object> properties = Maps.newHashMap();
+                properties.put(IsolatedBookieEnsemblePlacementPolicy.ISOLATION_BOOKIE_GROUPS,
+                        localPolicies.get().bookieAffinityGroup.getBookkeeperAffinityGroupPrimary());
+                properties.put(IsolatedBookieEnsemblePlacementPolicy.SECONDARY_ISOLATION_BOOKIE_GROUPS,
+                        localPolicies.get().bookieAffinityGroup.getBookkeeperAffinityGroupSecondary());
+                managedLedgerConfig.setBookKeeperEnsemblePlacementPolicyProperties(properties);
             }
-
             managedLedgerConfig.setThrottleMarkDelete(persistencePolicies.getManagedLedgerMaxMarkDeleteRate());
             managedLedgerConfig.setDigestType(serviceConfig.getManagedLedgerDigestType());
             managedLedgerConfig.setPassword(serviceConfig.getManagedLedgerPassword());
 
             managedLedgerConfig
                     .setMaxUnackedRangesToPersist(serviceConfig.getManagedLedgerMaxUnackedRangesToPersist());
-            managedLedgerConfig.setPersistentUnackedRangesWithMultipleEntriesEnabled(
-                    serviceConfig.isPersistentUnackedRangesWithMultipleEntriesEnabled());
-            managedLedgerConfig.setMaxUnackedRangesToPersistInMetadataStore(
-                    serviceConfig.getManagedLedgerMaxUnackedRangesToPersistInMetadataStore());
             managedLedgerConfig.setMaxEntriesPerLedger(serviceConfig.getManagedLedgerMaxEntriesPerLedger());
             managedLedgerConfig
                     .setMinimumRolloverTime(serviceConfig.getManagedLedgerMinLedgerRolloverTimeMinutes(),
@@ -1730,12 +1700,6 @@ private CompletableFuture<ManagedLedgerConfig> getManagedLedgerConfig(@Nonnull T
                     serviceConfig.getManagedLedgerInactiveLedgerRolloverTimeSeconds(), TimeUnit.SECONDS);
             managedLedgerConfig.setCacheEvictionByMarkDeletedPosition(
                     serviceConfig.isCacheEvictionByMarkDeletedPosition());
-            managedLedgerConfig.setMinimumBacklogCursorsForCaching(
-                    serviceConfig.getManagedLedgerMinimumBacklogCursorsForCaching());
-            managedLedgerConfig.setMinimumBacklogEntriesForCaching(
-                    serviceConfig.getManagedLedgerMinimumBacklogEntriesForCaching());
-            managedLedgerConfig.setMaxBacklogBetweenCursorsForCaching(
-                    serviceConfig.getManagedLedgerMaxBacklogBetweenCursorsForCaching());
 
             OffloadPoliciesImpl nsLevelOffloadPolicies =
                     (OffloadPoliciesImpl) policies.map(p -> p.offload_policies).orElse(null);