diff --git a/services/.env b/services/.env
new file mode 100644
index 000000000..26ae16252
--- /dev/null
+++ b/services/.env
@@ -0,0 +1,4 @@
+COMM_SERVICES_PORT_TUNNELBROKER=50051
+COMM_SERVICES_PORT_BACKUP=50052
+COMM_SERVICES_PORT_BLOB=50053
+COMM_TEST_SERVICES=0
diff --git a/services/scripts/build_base_image.sh b/services/scripts/build_base_image.sh
index 3ccf41887..85f74e275 100755
--- a/services/scripts/build_base_image.sh
+++ b/services/scripts/build_base_image.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
 
 set -e
 
-. ./scripts/services_config.sh
-
 docker-compose build $1
diff --git a/services/scripts/run_all_services.sh b/services/scripts/run_all_services.sh
index 41b9741e9..dad4156d4 100755
--- a/services/scripts/run_all_services.sh
+++ b/services/scripts/run_all_services.sh
@@ -1,17 +1,11 @@
 #!/bin/bash
 
 set -e
 
-. ./scripts/services_config.sh
-
-echo "tunnelbroker service will run at port ${COMM_SERVICES_PORT_TUNNELBROKER}"
-echo "backup service will run at port ${COMM_SERVICES_PORT_BACKUP}"
-echo "blob service will run at port ${COMM_SERVICES_PORT_BLOB}"
-
 SERVICES_LIST=`./scripts/list_services.sh`
 SERVICES=""
 for SERVICE in $SERVICES_LIST; do
   SERVICES="$SERVICES $SERVICE-server"
 done
 
 docker-compose up $SERVICES
diff --git a/services/scripts/run_server_image.sh b/services/scripts/run_server_image.sh
index 1e755fc89..c729a7096 100755
--- a/services/scripts/run_server_image.sh
+++ b/services/scripts/run_server_image.sh
@@ -1,41 +1,33 @@
 #!/bin/bash
 
 set -e
 
 if [ "$#" -lt 1 ] || [ "$#" -gt 2 ]; then
   echo "Illegal number of parameters, expected:"
   echo "- one argument with a name of the service, currently available services:"
   ./scripts/list_services.sh
   echo "- one optional argument with port"
   echo "- example: ./services/scripts/run_server_image.sh tunnelbroker 12345"
   exit 1;
 fi
 
-. ./scripts/services_config.sh
-
 SERVICE=$1
-PORT=0
 if [ "$SERVICE" == "tunnelbroker" ]; then
   if [ ! -z "$2" ]; then
     export COMM_SERVICES_PORT_TUNNELBROKER=$2
   fi
-  PORT=$COMM_SERVICES_PORT_TUNNELBROKER
 elif [ "$SERVICE" == "backup" ]; then
   if [ ! -z "$2" ]; then
     export COMM_SERVICES_PORT_BACKUP=$2
   fi
-  PORT=$COMM_SERVICES_PORT_BACKUP
 elif [ "$SERVICE" == "blob" ]; then
   if [ ! -z "$2" ]; then
     export COMM_SERVICES_PORT_BLOB=$2
   fi
-  PORT=$COMM_SERVICES_PORT_BLOB
 else
   echo "No such service ${SERVICE}, aborting"
   exit 1
 fi
 
-echo "${SERVICE} service will run at port ${PORT}"
-
 docker-compose build $SERVICE-server
 docker-compose up $SERVICE-server
diff --git a/services/scripts/services_config.sh b/services/scripts/services_config.sh
deleted file mode 100755
index ad7cfb947..000000000
--- a/services/scripts/services_config.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-set -e
-
-export COMM_SERVICES_PORT_TUNNELBROKER=50051
-export COMM_SERVICES_PORT_BACKUP=50052
-export COMM_SERVICES_PORT_BLOB=50053
-
-export COMM_TEST_SERVICES=0
diff --git a/services/scripts/test_service.sh b/services/scripts/test_service.sh
index 60aea4835..834881e85 100755
--- a/services/scripts/test_service.sh
+++ b/services/scripts/test_service.sh
@@ -1,21 +1,19 @@
 #!/bin/bash
 
 set -e
 
-. ./scripts/services_config.sh
-
 SERVICES=`./scripts/list_services.sh`
 SERVICE=`echo "$SERVICES" | grep $1` || echo "No such service: $1"
 
 if [ "$SERVICE" != "$1" ]; then
   echo "Expected one of these:"
   echo "$SERVICES"
   exit 1;
 fi;
 
 export COMM_TEST_SERVICES=1
 
 echo "${SERVICE} service will be tested"
 
 docker-compose build ${SERVICE}-server
 docker-compose run ${SERVICE}-server