diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,10 @@
 `ldap-scim-bridge` uses [PVP][1]-compatible versioning.
 The changelog is available [on GitHub][2].
 
+## 0.7
+
+- Fix TLS handshake to scim server (#23)
+
 ## 0.6
 
 - Work on README (#20)
diff --git a/ldap-scim-bridge.cabal b/ldap-scim-bridge.cabal
--- a/ldap-scim-bridge.cabal
+++ b/ldap-scim-bridge.cabal
@@ -1,10 +1,10 @@
 cabal-version:       2.4
 name:                ldap-scim-bridge
-version:             0.6
+version:             0.7
 synopsis:            See README for synopsis
 description:         See README for description
-homepage:            https://github.com/fisx/ldap-scim-bridge
-bug-reports:         https://github.com/fisx/ldap-scim-bridge/issues
+homepage:            https://github.com/wireapp/ldap-scim-bridge
+bug-reports:         https://github.com/wireapp/ldap-scim-bridge/issues
 license:             AGPL-3.0-or-later
 license-file:        LICENSE
 author:              Matthias Fischmann
diff --git a/src/LdapScimBridge.hs b/src/LdapScimBridge.hs
--- a/src/LdapScimBridge.hs
+++ b/src/LdapScimBridge.hs
@@ -325,8 +325,12 @@
         if scimTls conf
           then HTTP.tlsManagerSettings
           else HTTP.defaultManagerSettings
+      schema =
+        if scimTls conf
+          then Https
+          else Http
   manager <- HTTP.newManager settings
-  let base = BaseUrl Http (scimHost conf) (scimPort conf) (scimPath conf)
+  let base = BaseUrl schema (scimHost conf) (scimPort conf) (scimPath conf)
   pure $ mkClientEnv manager base
   where
     logErrors (SomeException e) = do