diff --git a/data-node/src/main/java/org/graylog/datanode/bindings/GenericBindings.java b/data-node/src/main/java/org/graylog/datanode/bindings/GenericBindings.java
index 52f5f05404..f1ca590da1 100644
--- a/data-node/src/main/java/org/graylog/datanode/bindings/GenericBindings.java
+++ b/data-node/src/main/java/org/graylog/datanode/bindings/GenericBindings.java
@@ -19,12 +19,12 @@ package org.graylog.datanode.bindings;
 import com.google.common.util.concurrent.ServiceManager;
 import org.graylog.security.certutil.CaService;
 import org.graylog.security.certutil.CaServiceImpl;
-import org.graylog2.bootstrap.preflight.PreflightConfigService;
-import org.graylog2.bootstrap.preflight.PreflightConfigServiceImpl;
 import org.graylog2.plugin.inject.Graylog2Module;
 import org.graylog2.security.CustomCAX509TrustManager;
 import org.graylog2.shared.bindings.providers.ServiceManagerProvider;
 
+import javax.net.ssl.X509TrustManager;
+
 public class GenericBindings extends Graylog2Module {
     private final boolean isMigrationCommand;
 
@@ -35,7 +35,7 @@ public class GenericBindings extends Graylog2Module {
     @Override
     protected void configure() {
         bind(ServiceManager.class).toProvider(ServiceManagerProvider.class).asEagerSingleton();
-        bind(CustomCAX509TrustManager.class).asEagerSingleton();
+        bind(X509TrustManager.class).to(CustomCAX509TrustManager.class).asEagerSingleton();
         bind(CaService.class).to(CaServiceImpl.class);
     }
 
diff --git a/graylog2-server/src/main/java/org/graylog2/bootstrap/preflight/ServerPreflightChecksModule.java b/graylog2-server/src/main/java/org/graylog2/bootstrap/preflight/ServerPreflightChecksModule.java
index 2e9c9a6cdc..a08565c225 100644
--- a/graylog2-server/src/main/java/org/graylog2/bootstrap/preflight/ServerPreflightChecksModule.java
+++ b/graylog2-server/src/main/java/org/graylog2/bootstrap/preflight/ServerPreflightChecksModule.java
@@ -28,12 +28,12 @@ import org.graylog2.plugin.inject.Graylog2Module;
 import org.graylog2.plugin.system.FilePersistedNodeIdProvider;
 import org.graylog2.plugin.system.NodeId;
 import org.graylog2.security.CustomCAX509TrustManager;
-import org.graylog2.security.IndexerJwtAuthTokenProvider;
 import org.graylog2.security.TrustManagerProvider;
 import org.graylog2.shared.bindings.providers.OkHttpClientProvider;
 import org.graylog2.storage.providers.ElasticsearchVersionProvider;
 
 import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
 
 public class ServerPreflightChecksModule extends Graylog2Module {
 
@@ -45,7 +45,7 @@ public class ServerPreflightChecksModule extends Graylog2Module {
                 .implement(TrustManager.class, CustomCAX509TrustManager.class)
                 .build(TrustManagerProvider.class));
 
-        bind(CustomCAX509TrustManager.class).asEagerSingleton();
+        bind(X509TrustManager.class).to(CustomCAX509TrustManager.class).asEagerSingleton();
 
         bind(KeystoreContentMover.class).to(SinglePasswordKeystoreContentMover.class).asEagerSingleton();
         bind(OkHttpClient.class).toProvider(OkHttpClientProvider.class).asEagerSingleton();
diff --git a/graylog2-server/src/main/java/org/graylog2/security/TrustManagerAndSocketFactoryProvider.java b/graylog2-server/src/main/java/org/graylog2/security/TrustManagerAndSocketFactoryProvider.java
index e00fc27cc7..b5a22abcc2 100644
--- a/graylog2-server/src/main/java/org/graylog2/security/TrustManagerAndSocketFactoryProvider.java
+++ b/graylog2-server/src/main/java/org/graylog2/security/TrustManagerAndSocketFactoryProvider.java
@@ -33,7 +33,7 @@ public class TrustManagerAndSocketFactoryProvider {
     private final SSLContext sslContext;
 
     @Inject
-    public TrustManagerAndSocketFactoryProvider(CustomCAX509TrustManager trustManager) throws NoSuchAlgorithmException, KeyManagementException {
+    public TrustManagerAndSocketFactoryProvider(X509TrustManager trustManager) throws NoSuchAlgorithmException, KeyManagementException {
         this.sslContext = SSLContext.getInstance("TLS");
         this.trustManager = trustManager;
         sslContext.init(null, new TrustManager[]{this.trustManager}, new SecureRandom());
diff --git a/graylog2-server/src/main/java/org/graylog2/shared/security/SecurityBindings.java b/graylog2-server/src/main/java/org/graylog2/shared/security/SecurityBindings.java
index 8fa1c85a81..620583f42c 100644
--- a/graylog2-server/src/main/java/org/graylog2/shared/security/SecurityBindings.java
+++ b/graylog2-server/src/main/java/org/graylog2/shared/security/SecurityBindings.java
@@ -31,6 +31,7 @@ import org.graylog2.security.UserSessionTerminationService;
 import org.graylog2.security.encryption.EncryptedValueService;
 
 import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
 
 public class SecurityBindings extends PluginModule {
     @Override
@@ -45,7 +46,7 @@ public class SecurityBindings extends PluginModule {
         install(new FactoryModuleBuilder()
                 .implement(TrustManager.class, DefaultX509TrustManager.class)
                 .build(TrustManagerProvider.class));
-        bind(CustomCAX509TrustManager.class).asEagerSingleton();
+        bind(X509TrustManager.class).to(CustomCAX509TrustManager.class).asEagerSingleton();
 
         OptionalBinder.newOptionalBinder(binder(), ActorAwareAuthenticationTokenFactory.class)
                 .setDefault().to(ActorAwareUsernamePasswordTokenFactory.class);