diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml
index b1ebef2472..d8e9966827 100644
--- a/.github/workflows/maven.yaml
+++ b/.github/workflows/maven.yaml
@@ -51,7 +51,7 @@ jobs:
           scan_secrets: true
           scan_dependencies: true
           enable_github_action_token: true
-          enable_pr_comments: ${{ env.ENDORCTL_PR }}
+          enable_pr_comments: true
           github_token: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Endor Labs Release Scan
@@ -69,4 +69,4 @@ jobs:
     # - name: Upload findings to github
     #   uses: github/codeql-action/upload-sarif
     #   with:
-    #     sarif_file: 'findings.sarif'
\ No newline at end of file
+    #     sarif_file: 'findings.sarif'
diff --git a/pom.xml b/pom.xml
index 24246b18a7..5dc1beca7f 100755
--- a/pom.xml
+++ b/pom.xml
@@ -651,7 +651,6 @@
         <dependency>
             <groupId>org.apache.directory.server</groupId>
             <artifactId>apacheds-core</artifactId>
-            <!-- Upgrading to 2.0.0-M24 is an API breaking change. But it might be needed for Java 10, because I get this error, that I don't get with Java 8: [java] at org.apache.directory.server.core.DefaultDirectoryService.initialize(DefaultDirectoryService.java:1426) [java] at org.apache.directory.server.core.DefaultDirectoryService.startup(DefaultDirectoryService.java:907) [java] at org.owasp.benchmark.helpers.LDAPServer.initDirectoryService(LDAPServer.java:148) [java] at org.owasp.benchmark.helpers.LDAPServer.<init>(LDAPServer.java:42) [java] at org.owasp.benchmark.helpers.LDAPServer.main(LDAPServer.java:320) [java] Caused by: java.lang.NumberFormatException: multiple points [java] at java.base/jdk.internal.math.FloatingDecimal.readJavaFormatString(FloatingDecimal.java:1914) -->
             <version>${version.apacheds}</version>
             <exclusions>
                 <!-- Excluded because its old, and there is a bug in it causing an exception when using it. -->
@@ -788,8 +787,8 @@
         <dependency>
             <groupId>org.hsqldb</groupId>
             <artifactId>hsqldb</artifactId>
-            <version>2.7.1</version>
-            <!--<version>2.5.2</version> -->
+            <!--<version>2.7.1</version> -->
+            <version>2.5.2</version>
         </dependency>
 
         <dependency>
@@ -1210,7 +1209,6 @@
         <project.java.target>1.8</project.java.target>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven.war.webxml>${basedir}/src/config/web.xml</maven.war.webxml>
-        <!-- runenv defaults to local here. But scripts can set this to 'remote' to launch remotely accessible Benchmark. e.g., mvn clean package cargo:run -Pdeploy1.2 -Drunenv=remote -->
         <runenv>local</runenv>
         <tomcat.jvmargs>
             -Xms1G