diff --git a/2repository/23.1/community-23.1.0/overload.gradle b/2repository/23.1/community-23.1.0/overload.gradle
index 1011ea20..00383301 100644
--- a/2repository/23.1/community-23.1.0/overload.gradle
+++ b/2repository/23.1/community-23.1.0/overload.gradle
@@ -10,8 +10,7 @@ ext {
     ]
     solrimage = 'docker.io/xenit/alfresco-solr6:2.0.8.2'
     shareimage = 'docker.io/xenit/alfresco-share-community:23.1.0'
-//    13,14,15 are supported
-    psqlimage = 'docker.io/xenit/postgres:13'
+    psqlimage = 'postgres:15'
     tests = true
     alfrescoBomVersion='23.1.0'
 }
diff --git a/2repository/23.1/enterprise-23.1.0/overload.gradle b/2repository/23.1/enterprise-23.1.0/overload.gradle
index 4dd0d7d6..30ef53af 100644
--- a/2repository/23.1/enterprise-23.1.0/overload.gradle
+++ b/2repository/23.1/enterprise-23.1.0/overload.gradle
@@ -10,7 +10,7 @@ ext {
     ]
     solrimage = 'docker.io/xenit/alfresco-solr6:2.0.8.2'
     shareimage = 'docker.io/xenit/alfresco-share-community:23.1.0'
-    psqlimage = 'docker.io/xenit/postgres:13'
+    psqlimage = 'postgres:15'
     tests = true
     alfrescoBomVersion = '23.1.0'
 }
diff --git a/2repository/23.2/community-23.2.0/overload.gradle b/2repository/23.2/community-23.2.0/overload.gradle
index d3221184..fc6c4a0e 100644
--- a/2repository/23.2/community-23.2.0/overload.gradle
+++ b/2repository/23.2/community-23.2.0/overload.gradle
@@ -10,7 +10,7 @@ ext {
     ]
     solrimage = 'docker.io/xenit/alfresco-solr6:2.0.8.2'
     shareimage = 'docker.io/xenit/alfresco-share-community:23.2.0'
-    psqlimage = 'docker.io/xenit/postgres:13'
+    psqlimage = 'postgres:15'
     tests = true
     alfrescoBomVersion='23.2.0'
 }
diff --git a/2repository/23.2/enterprise-23.2.0/overload.gradle b/2repository/23.2/enterprise-23.2.0/overload.gradle
index 516d4ed7..a9da5edd 100644
--- a/2repository/23.2/enterprise-23.2.0/overload.gradle
+++ b/2repository/23.2/enterprise-23.2.0/overload.gradle
@@ -10,7 +10,7 @@ ext {
     ]
     solrimage = 'docker.io/xenit/alfresco-solr6:2.0.8.2'
     shareimage = 'docker.io/xenit/alfresco-share-community:23.2.0'
-    psqlimage = 'docker.io/xenit/postgres:13'
+    psqlimage = 'postgres:15'
     tests = true
     alfrescoBomVersion = '23.2.0'
 }
diff --git a/tomcat-base/build.gradle b/tomcat-base/build.gradle
index b6bcd69f..b37aa904 100644
--- a/tomcat-base/build.gradle
+++ b/tomcat-base/build.gradle
@@ -47,7 +47,7 @@ subprojects {
         implementation "org.apache.tomcat:tomcat-jasper-el:${tomcatVersion}"
         implementation "org.apache.tomcat:tomcat-jsp-api:${tomcatVersion}"
         implementation "eu.xenit.logging:json-logging:${jsonLoggingVersion}"
-        implementation "com.fasterxml.jackson.core:jackson-databind:2.15.3"
+//        implementation "com.fasterxml.jackson.core:jackson-databind:2.15.3"
         testImplementation "org.junit.jupiter:junit-jupiter-api:5.10.0"
         testImplementation("org.junit-pioneer:junit-pioneer:2.1.0")
         testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.10.0"
diff --git a/tomcat-base/src/shared/main/java/eu/xenit/alfresco/tomcat/embedded/alfresco/tomcat/AlfrescoTomcatFactoryHelper.java b/tomcat-base/src/shared/main/java/eu/xenit/alfresco/tomcat/embedded/alfresco/tomcat/AlfrescoTomcatFactoryHelper.java
index f8a629c2..77d7aa23 100644
--- a/tomcat-base/src/shared/main/java/eu/xenit/alfresco/tomcat/embedded/alfresco/tomcat/AlfrescoTomcatFactoryHelper.java
+++ b/tomcat-base/src/shared/main/java/eu/xenit/alfresco/tomcat/embedded/alfresco/tomcat/AlfrescoTomcatFactoryHelper.java
@@ -67,10 +67,6 @@ public static void createSSLConnector(Tomcat tomcat, AlfrescoConfiguration alfre
         );
 
         SSLHostConfig sslHostConfig = new SSLHostConfig();
-        // This is deprecated in Tomcat 9 and deleted from Tomcat V10.1!
-//            sslHostConfig.setCertificateKeystoreFile(alfrescoConfiguration.getTomcatSSLKeystore());
-//            sslHostConfig.setCertificateKeystorePassword(alfrescoConfiguration.getTomcatSSLKeystorePassword());
-//            sslHostConfig.setCertificateKeystoreType("JCEKS");
         SSLHostConfigCertificate sslHostConfigCertificate = new SSLHostConfigCertificate(sslHostConfig, SSLHostConfigCertificate.Type.UNDEFINED);
         sslHostConfigCertificate.setCertificateKeystoreFile(alfrescoConfiguration.getTomcatSSLKeystore());
         sslHostConfigCertificate.setCertificateKeystorePassword(alfrescoConfiguration.getTomcatSSLKeystorePassword());