diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml
index 7ba24d0..9a1fc9a 100644
--- a/.github/workflows/smoke-tests.yml
+++ b/.github/workflows/smoke-tests.yml
@@ -30,6 +30,8 @@ jobs:
           distribution: zulu
 
       - name: Build with Maven
+        env:
+          MAVEN_OPTS: -Xms256m -Xmx3g -XX:+UseG1GC
         run: mvn -B package --file pom.xml -Dmaven.test.skip=true
 
       - name: Docker Pull HTTP client
diff --git a/pom.xml b/pom.xml
index 521e3b7..67b64e0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@
     <parent>
         <groupId>ca.uhn.hapi.fhir</groupId>
         <artifactId>hapi-fhir</artifactId>
-        <version>8.6.1</version>
+        <version>8.6.5</version>
     </parent>
 
     <artifactId>hapi-fhir-jpaserver-starter</artifactId>
diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/common/StarterJpaConfig.java b/src/main/java/ca/uhn/fhir/jpa/starter/common/StarterJpaConfig.java
index 86e4793..79ee250 100644
--- a/src/main/java/ca/uhn/fhir/jpa/starter/common/StarterJpaConfig.java
+++ b/src/main/java/ca/uhn/fhir/jpa/starter/common/StarterJpaConfig.java
@@ -1,9 +1,9 @@
 package ca.uhn.fhir.jpa.starter.common;
 
 import ca.uhn.fhir.batch2.config.Batch2JobRegisterer;
+import ca.uhn.fhir.batch2.jobs.bulkmodify.reindex.ReindexProvider;
 import ca.uhn.fhir.batch2.jobs.export.BulkDataExportProvider;
 import ca.uhn.fhir.batch2.jobs.imprt.BulkDataImportProvider;
-import ca.uhn.fhir.batch2.jobs.reindex.ReindexProvider;
 import ca.uhn.fhir.context.ConfigurationException;
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.context.FhirVersionEnum;