diff --git a/docker-compose.yml b/docker-compose.yml
index c09bb9e1..bbe31759 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -23,11 +23,6 @@ services:
       - TRUST_PROXY=0
       - DATABASE_URL=postgresql://postgres@postgres/planka
       - SECRET_KEY=notsecretkey
-      # related: https://github.com/knex/knex/issues/2354
-      # As knex does not pass query parameters from the connection string we
-      # have to use environment variables in order to pass the desired values, e.g.
-      # note: this is optional
-      # PGSSLMODE=require
     depends_on:
       - postgres
 
diff --git a/server/.env.sample b/server/.env.sample
index aac41a0d..b9b6f2e9 100644
--- a/server/.env.sample
+++ b/server/.env.sample
@@ -9,11 +9,6 @@ SECRET_KEY=notsecretkey
 # TRUST_PROXY=0
 # TOKEN_EXPIRES_IN=365 # In days
 
-# related: https://github.com/knex/knex/issues/2354
-# As knex does not pass query parameters from the connection string we
-# have to use environment variables in order to pass the desired values, e.g.
-# PGSSLMODE=<value>
-
 ## Do not edit this
 
 TZ=UTC
diff --git a/server/db/knexfile.js b/server/db/knexfile.js
index 7ba13d94..ef294733 100755
--- a/server/db/knexfile.js
+++ b/server/db/knexfile.js
@@ -8,12 +8,7 @@ dotenv.config({
 
 module.exports = {
   client: 'pg',
-  connection: {
-    connectionString: process.env.DATABASE_URL,
-    ssl: {
-      rejectUnauthorized: false,
-    },
-  },
+  connection: process.env.DATABASE_URL,
   migrations: {
     tableName: 'migration',
     directory: path.join(__dirname, 'migrations'),