diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/BaseConfig.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/BaseConfig.java
index 0bd2e393a4a..7416f1c564c 100644
--- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/BaseConfig.java
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/BaseConfig.java
@@ -913,7 +913,7 @@ public abstract class BaseConfig {
 	}
 
 	@Bean
-	public IndexNamePrefixLayoutStrategy indexNamePrefixLayoutStrategy() {
+	public IndexNamePrefixLayoutStrategy indexLayoutStrategy() {
 		return new IndexNamePrefixLayoutStrategy();
 	}
 
diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/elastic/IndexNamePrefixLayoutStrategy.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/elastic/IndexNamePrefixLayoutStrategy.java
index 8a5636c21b3..9f5f48f37af 100644
--- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/elastic/IndexNamePrefixLayoutStrategy.java
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/elastic/IndexNamePrefixLayoutStrategy.java
@@ -20,8 +20,8 @@ import java.util.regex.Pattern;
 @Service
 public class IndexNamePrefixLayoutStrategy implements IndexLayoutStrategy {
 
-//	@Autowired
-//	private DaoConfig myDaoConfig;
+	@Autowired
+	private DaoConfig myDaoConfig;
 
 	static final Log log = (Log) LoggerFactory.make(Log.class, MethodHandles.lookup());
 	public static final String NAME = "prefix";
@@ -40,9 +40,9 @@ public class IndexNamePrefixLayoutStrategy implements IndexLayoutStrategy {
 	}
 
 	private String addPrefixIfNecessary(String theCandidateName) {
-		String myDaoConfig = "zoop";
-		if (!StringUtils.isBlank(myDaoConfig)) {
-			return myDaoConfig + "-" + theCandidateName;
+
+		if (!StringUtils.isBlank(myDaoConfig.getElasticSearchIndexPrefix())) {
+			return myDaoConfig.getElasticSearchIndexPrefix() + "-" + theCandidateName;
 		} else {
 			return theCandidateName;
 		}
@@ -63,9 +63,8 @@ public class IndexNamePrefixLayoutStrategy implements IndexLayoutStrategy {
 	}
 
 	private String removePrefixIfNecessary(String theCandidateUniqueKey) {
-		String myDaoConfig = "zoop";
-		if (!StringUtils.isBlank(myDaoConfig)) {
-			return theCandidateUniqueKey.replace(myDaoConfig+ "-", "");
+		if (!StringUtils.isBlank(myDaoConfig.getElasticSearchIndexPrefix())) {
+			return theCandidateUniqueKey.replace(myDaoConfig.getElasticSearchIndexPrefix() + "-", "");
 		} else {
 			return theCandidateUniqueKey;
 		}
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestR4ConfigWithElasticSearch.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestR4ConfigWithElasticSearch.java
index e5fbd33786b..2e358abe4ec 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestR4ConfigWithElasticSearch.java
+++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestR4ConfigWithElasticSearch.java
@@ -13,6 +13,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.DependsOn;
 import org.testcontainers.elasticsearch.ElasticsearchContainer;
 
 import javax.annotation.PreDestroy;