diff --git a/catalog/ui/search-ui/simple/pom.xml b/catalog/ui/search-ui/simple/pom.xml
index f41e83ec6ca5..a850990fdc30 100644
--- a/catalog/ui/search-ui/simple/pom.xml
+++ b/catalog/ui/search-ui/simple/pom.xml
@@ -67,7 +67,7 @@
             <plugin>
                 <groupId>net.alchim31.maven</groupId>
                 <artifactId>yuicompressor-maven-plugin</artifactId>
-                <version>1.3.0</version>
+                <version>1.5.1</version>
                 <executions>
                     <execution>
                         <id>compress</id>
diff --git a/distribution/docs/pom.xml b/distribution/docs/pom.xml
index 43f464840a2b..539da22964ee 100644
--- a/distribution/docs/pom.xml
+++ b/distribution/docs/pom.xml
@@ -198,7 +198,7 @@
             <plugin>
                 <groupId>org.jbake</groupId>
                 <artifactId>jbake-maven-plugin</artifactId>
-                <version>0.3.3</version>
+                <version>2.7.0-rc.7</version>
                 <executions>
                     <execution>
                         <phase>generate-resources</phase>
@@ -212,20 +212,10 @@
                     <outputDirectory>${project.build.directory}/asciidoctor-ready-${project.version}</outputDirectory>
                 </configuration>
                 <dependencies>
-                    <dependency>
-                        <groupId>org.freemarker</groupId>
-                        <artifactId>freemarker</artifactId>
-                        <version>2.3.30</version>
-                    </dependency>
                     <dependency>
                         <groupId>org.asciidoctor</groupId>
-                        <artifactId>asciidoctor-maven-plugin</artifactId>
-                        <version>${asciidoctor.maven.plugin.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.pegdown</groupId>
-                        <artifactId>pegdown</artifactId>
-                        <version>1.6.0</version>
+                        <artifactId>asciidoctorj</artifactId>
+                        <version>2.5.13</version>
                     </dependency>
                 </dependencies>
             </plugin>
diff --git a/distribution/docs/src/main/resources/jbake.properties b/distribution/docs/src/main/resources/jbake.properties
index 84cfb5321f10..48c22794f00a 100644
--- a/distribution/docs/src/main/resources/jbake.properties
+++ b/distribution/docs/src/main/resources/jbake.properties
@@ -19,13 +19,13 @@ template.subSecuring.file=managing.ftl
 template.installing.file=managing.ftl
 template.subInstalling.file=managing.ftl
 template.installingIntro.file=managing.ftl
-template.configuringIntro.file=build/configuring.ftl
-template.configuration.file=build/configuring.ftl
-template.subConfiguration.file=build/configuring.ftl
-template.configuringAdminConsole.file=build/configuring.ftl
-template.configuringCommandConsole.file=build/configuring.ftl
-template.configuringConfigFile.file=build/configuring.ftl
-template.configuringImport.file=build/configuring.ftl
+template.configuringIntro.file=configuring.ftl
+template.configuration.file=configuring.ftl
+template.subConfiguration.file=configuring.ftl
+template.configuringAdminConsole.file=configuring.ftl
+template.configuringCommandConsole.file=configuring.ftl
+template.configuringConfigFile.file=configuring.ftl
+template.configuringImport.file=configuring.ftl
 template.runningIntro.file=managing.ftl
 template.startingIntro.file=managing.ftl
 template.maintainingIntro.file=managing.ftl
@@ -40,13 +40,13 @@ template.using.file=using.ftl
 template.subUsing.file=using.ftl
 template.integratingIntro.file=integrating.ftl
 template.federationIntro.file=integrating.ftl
-template.endpoint.file=build/endpoints.ftl
-template.endpointService.file=build/endpoints.ftl
-template.endpointIntro.file=build/endpoints.ftl
-template.eventing.file=build/eventing.ftl
-template.source.file=build/sources.ftl
-template.sourceIntro.file=build/sources.ftl
-template.sourceService.file=build/sources.ftl
+template.endpoint.file=endpoints.ftl
+template.endpointService.file=endpoints.ftl
+template.endpointIntro.file=endpoints.ftl
+template.eventing.file=eventing.ftl
+template.source.file=sources.ftl
+template.sourceIntro.file=sources.ftl
+template.sourceService.file=sources.ftl
 template.developingIntro.file=architectures.ftl
 template.catalogFrameworkIntro.file=architectures.ftl
 template.catalogFramework.file=architectures.ftl
diff --git a/platform/security/core/security-core-impl/src/test/groovy/ddf/security/samlp/impl/EntityInformationSpec.groovy b/platform/security/core/security-core-impl/src/test/groovy/ddf/security/samlp/impl/EntityInformationSpec.groovy
index 0a7844e7e78d..5e4d4e93217f 100644
--- a/platform/security/core/security-core-impl/src/test/groovy/ddf/security/samlp/impl/EntityInformationSpec.groovy
+++ b/platform/security/core/security-core-impl/src/test/groovy/ddf/security/samlp/impl/EntityInformationSpec.groovy
@@ -27,6 +27,7 @@ class EntityInformationSpec extends Specification {
 
     void setup() {
         // This method is for any setup that should run before each test
+        System.setProperty("ddf.home", "/")
     }
 
     void cleanup() {