diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 711764e0..bdf95afe 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -22,9 +22,9 @@ jobs:
       EXCHANGE_FE_HEADER: issuer
       EXCHANGE_PEKKO_LOGLEVEL: debug
       EXCHANGE_ROOT_PW: ci-password
-      POSTGRES_DB_NAME: exchange
-      POSTGRES_DB_PORT: 5432
-      POSTGRES_DB_USER: admin
+      EXCHANGE_DB_NAME: exchange
+      EXCHANGE_DB_PORT: 5432
+      EXCHANGE_DB_USER: admin
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
@@ -43,7 +43,7 @@ jobs:
           pwd
           java -version
           make docker-network
-          docker run -d -e POSTGRES_HOST_AUTH_METHOD=trust -e POSTGRES_DB=$POSTGRES_DB_NAME -e POSTGRES_USER=$POSTGRES_DB_USER --network $DOCKER_NETWORK --name postgres postgres
+          docker run -d -e POSTGRES_HOST_AUTH_METHOD=trust -e POSTGRES_DB=$EXCHANGE_DB_NAME -e POSTGRES_USER=$EXCHANGE_DB_USER --network $DOCKER_NETWORK --name postgres postgres
           export POSTGRES_CONTAINER_ADDRESS=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' postgres)
           export EXCHANGE_DB_HOST=$POSTGRES_CONTAINER_ADDRESS
           make run-docker
diff --git a/Makefile b/Makefile
index bd137eda..b7dc81d5 100644
--- a/Makefile
+++ b/Makefile
@@ -66,11 +66,14 @@ JAVA_OPTS ?=#-Xmx1G
 POSTGRES_CONTAINER_ADDRESS ?= $(shell docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $(POSTGRES_CONTAINER_NAME))
 POSTGRES_CONTAINER_NAME ?= postgres
 POSTGRES_DB_NAME ?= exchange
+EXCHANGE_DB_NAME ?= $(POSTGRES_DB_NAME)
 POSTGRES_DB_PORT ?= 5432
+EXCHANGE_DB_PORT ?= $(POSTGRES_DB_PORT)
 POSTGRES_DB_USER ?= admin
+EXCHANGE_DB_USER ?= $(POSTGRES_DB_USER)
 PROJECT_DIRECTORY ?= $(shell pwd)
 # Try to sync this version with the version of scala you have installed on your dev machine, and with what is specified in build.sbt
-SCALA_VERSION ?= 2.13.10
+SCALA_VERSION ?= 2.13.14
 SCALA_VERSION_SHORT ?= 2.13