diff --git a/config/custom-environment-variables.js b/config/custom-environment-variables.js
index 78100cc353ca84039d61875b437b7799993325ea..4dccdd862b6a408f40433888f322a03deaba8f0c 100644
--- a/config/custom-environment-variables.js
+++ b/config/custom-environment-variables.js
@@ -16,7 +16,10 @@ module.exports = {
     secret: 'PUBSWEET_SECRET',
     db: {
       host: 'POSTGRES_HOST',
-      port: 'POSTGRES_PORT',
+      // TODO: The port variable actually gets set to e.g. tcp://172.0.2.1:5321
+      // by GitLab's CI - this a bug in their code.
+      // Resulting in: RangeError [ERR_SOCKET_BAD_PORT]: Port should be >= 0 and < 65536. Received NaN.
+      // port: 'POSTGRES_PORT',
       database: 'POSTGRES_DB',
       user: 'POSTGRES_USER',
       password: 'POSTGRES_PASSWORD',
diff --git a/server/app.js b/server/app.js
index 5098c07124016b7a060a83b8c96c2d6834539f37..8a76aa0af6c1f67c5a104c492d8e052a666aa728 100644
--- a/server/app.js
+++ b/server/app.js
@@ -4,8 +4,6 @@ const dotenvPath = path.resolve(`.env.${process.env.NODE_ENV || 'development'}`)
 require('dotenv').config({ path: dotenvPath })
 
 const config = require('config')
-console.log('CONFIG', config)
-console.log('ENV', process.env)
 const express = require('express')
 const morgan = require('morgan')
 const helmet = require('helmet')