diff --git a/catalog/core/catalog-core-camelcomponent/pom.xml b/catalog/core/catalog-core-camelcomponent/pom.xml
index 96dafd77566..a06f90589fa 100644
--- a/catalog/core/catalog-core-camelcomponent/pom.xml
+++ b/catalog/core/catalog-core-camelcomponent/pom.xml
@@ -154,6 +154,7 @@
                             org.apache.camel*; version="2.10.0",
                             org.osgi.framework; version="1.5.0",
                             org.slf4j*; version="1.6.0",
+                            jakarta.servlet;resolution:=optional,
                             !org.abego.treelayout.*,
                             sun.misc;resolution:=optional,
                             javax.cache;resolution:=optional,
diff --git a/catalog/core/catalog-core-downloadaction/pom.xml b/catalog/core/catalog-core-downloadaction/pom.xml
index d3b6ac603d5..a64006c5ab8 100644
--- a/catalog/core/catalog-core-downloadaction/pom.xml
+++ b/catalog/core/catalog-core-downloadaction/pom.xml
@@ -78,6 +78,7 @@
                             antlr4-runtime
                         </Embed-Dependency>
                         <Import-Package>
+                            jakarta.servlet;resolution:=optional,
                             !org.abego.treelayout.*,
                             *
                         </Import-Package>
diff --git a/catalog/plugin/catalog-plugin-metacardbackup-filestorage/pom.xml b/catalog/plugin/catalog-plugin-metacardbackup-filestorage/pom.xml
index 7c20d295629..4408113b4dc 100644
--- a/catalog/plugin/catalog-plugin-metacardbackup-filestorage/pom.xml
+++ b/catalog/plugin/catalog-plugin-metacardbackup-filestorage/pom.xml
@@ -100,6 +100,7 @@
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Include-Resource>{maven-resources},target/classes/describable.properties</Include-Resource>
                         <Import-Package>
+                            jakarta.servlet;resolution:=optional,
                             !org.abego.treelayout.*,
                             *
                         </Import-Package>
diff --git a/catalog/plugin/catalog-plugin-metacardbackup-s3storage/pom.xml b/catalog/plugin/catalog-plugin-metacardbackup-s3storage/pom.xml
index 7af75810ffb..bb6e9c456ef 100644
--- a/catalog/plugin/catalog-plugin-metacardbackup-s3storage/pom.xml
+++ b/catalog/plugin/catalog-plugin-metacardbackup-s3storage/pom.xml
@@ -134,6 +134,7 @@
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Include-Resource>{maven-resources},target/classes/describable.properties</Include-Resource>
                         <Import-Package>
+                            jakarta.servlet;resolution:=optional,
                             !org.abego.treelayout.*,
                             *
                         </Import-Package>
diff --git a/catalog/plugin/catalog-plugin-metacardbackup-storage-api/pom.xml b/catalog/plugin/catalog-plugin-metacardbackup-storage-api/pom.xml
index d3af374c1cd..ecf07764164 100644
--- a/catalog/plugin/catalog-plugin-metacardbackup-storage-api/pom.xml
+++ b/catalog/plugin/catalog-plugin-metacardbackup-storage-api/pom.xml
@@ -31,10 +31,6 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Embed-Dependency>
-                            handlebars,
-                            antlr4-runtime
-                        </Embed-Dependency>
                         <Export-Package>
                             org.codice.ddf.catalog.plugin.metacard.backup.internal*
                         </Export-Package>
diff --git a/catalog/spatial/kml/spatial-kml-networklinkendpoint/pom.xml b/catalog/spatial/kml/spatial-kml-networklinkendpoint/pom.xml
index 312bbfe645d..d5369a9ef82 100644
--- a/catalog/spatial/kml/spatial-kml-networklinkendpoint/pom.xml
+++ b/catalog/spatial/kml/spatial-kml-networklinkendpoint/pom.xml
@@ -87,6 +87,7 @@
                             commons-lang3
                         </Embed-Dependency>
                         <Import-Package>
+                            jakarta.servlet;resolution:=optional,
                             !org.abego.treelayout.*,
                             *
                         </Import-Package>
diff --git a/catalog/spatial/kml/spatial-kml-transformer/pom.xml b/catalog/spatial/kml/spatial-kml-transformer/pom.xml
index 09f8fcad909..f41b9480018 100644
--- a/catalog/spatial/kml/spatial-kml-transformer/pom.xml
+++ b/catalog/spatial/kml/spatial-kml-transformer/pom.xml
@@ -132,7 +132,11 @@
                             catalog-core-actions,
                             spatial-kml-util
                         </Embed-Dependency>
-                        <Import-Package>!org.abego.treelayout.*, *</Import-Package>
+                        <Import-Package>
+                            jakarta.servlet;resolution:=optional,
+                            !org.abego.treelayout.*,
+                            *
+                        </Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/catalog/spatial/wfs/spatial-wfs-featuretransformer-handlebars/pom.xml b/catalog/spatial/wfs/spatial-wfs-featuretransformer-handlebars/pom.xml
index dbb6e4d63dc..0ef58ae9d9f 100644
--- a/catalog/spatial/wfs/spatial-wfs-featuretransformer-handlebars/pom.xml
+++ b/catalog/spatial/wfs/spatial-wfs-featuretransformer-handlebars/pom.xml
@@ -149,6 +149,7 @@
                             spatial-wfs-v1_0_0-schema-bindings
                         </Embed-Dependency>
                         <Import-Package>
+                            jakarta.servlet;resolution:=optional,
                             !org.abego.treelayout.*,
                             !com.sun.management,
                             !org.bouncycastle.crypto.*,
diff --git a/catalog/transformer/catalog-transformer-html/pom.xml b/catalog/transformer/catalog-transformer-html/pom.xml
index 1110fd8ae6a..7e4756aeaa0 100644
--- a/catalog/transformer/catalog-transformer-html/pom.xml
+++ b/catalog/transformer/catalog-transformer-html/pom.xml
@@ -139,6 +139,7 @@
         <configuration>
           <instructions>
             <Import-Package>
+              jakarta.servlet;resolution:=optional,
               !org.abego.treelayout.*,
               *
             </Import-Package>
diff --git a/features/admin/src/main/feature/feature.xml b/features/admin/src/main/feature/feature.xml
index 18c1925cfe5..ffc540360a2 100644
--- a/features/admin/src/main/feature/feature.xml
+++ b/features/admin/src/main/feature/feature.xml
@@ -39,6 +39,7 @@
         <feature>pax-web-http-whiteboard</feature>
         <feature>resource-bundle-locator</feature>
         <bundle>mvn:org.apache.commons/commons-lang3/${commons-lang3.version}</bundle>
+        <bundle>mvn:org.apache.commons/commons-text/${commons-text.version}</bundle>
         <bundle>mvn:ddf.platform/landing-page/${project.version}</bundle>
     </feature>
 
diff --git a/platform/landing-page/pom.xml b/platform/landing-page/pom.xml
index 445b91022ec..2d8dc484715 100644
--- a/platform/landing-page/pom.xml
+++ b/platform/landing-page/pom.xml
@@ -113,6 +113,7 @@
                 <configuration>
                     <instructions>
                         <Import-Package>
+                            jakarta.servlet;resolution:=optional,
                             !org.abego.treelayout.*,
                             org.codice.ddf.branding;version="[2,3)",
                             *
diff --git a/pom.xml b/pom.xml
index 3b7c56c8b1c..f88aafbf698 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,7 +109,7 @@
         <gib.enabled>false</gib.enabled>
         <gib.failOnError>false</gib.failOnError>
 
-        <jknack.handlebars.version>4.3.1</jknack.handlebars.version>
+        <jknack.handlebars.version>4.5.2</jknack.handlebars.version>
         <picocontainer.version>1.3_1</picocontainer.version>
         <dom4j.bundle.version>2.1.3_1</dom4j.bundle.version>