diff --git a/Dockerfile b/Dockerfile
index f830e1efe25463c8db60341e7bd86a1e60812fc7..c63f6676fd6570cd2b3a03b5516f76600e8cbd42 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Build stage for Java classes
-FROM hbpmip/java-base-build:3.5.0-jdk-8-6 as java-build-env
+FROM hbpmip/java-base-build:3.5.0-jdk-8-9 as java-build-env
 
 COPY pom.xml /project/
 COPY src/ /project/src/
diff --git a/tests/pre-test-run.sh b/tests/pre-test-run.sh
index 6835825b7bd4e1e6e2daec43863734a9d2ca2459..f14b8d789e579746641219cf5425eb49377b873b 100755
--- a/tests/pre-test-run.sh
+++ b/tests/pre-test-run.sh
@@ -32,9 +32,9 @@ fi
 # Run databases containers
 
 echo "Running databases containers..."
-docker run --name features-db-test -p 65432:5432 -v $(pwd)/tests/features-db/sql:/docker-entrypoint-initdb.d/ -e POSTGRES_USER=postgres -d postgres:9.6.3-alpine
-docker run --name meta-db-test -p 65433:5432 -v $(pwd)/tests/meta-db/sql:/docker-entrypoint-initdb.d/ -e POSTGRES_USER=postgres -d postgres:9.6.3-alpine
-docker run --name portal-db-test -p 65434:5432 -e POSTGRES_USER=postgres -d postgres:9.6.3-alpine
+docker run --name features-db-test -p 65432:5432 -v $(pwd)/tests/features-db/sql:/docker-entrypoint-initdb.d/ -e POSTGRES_USER=postgres -d postgres:9.6.5-alpine
+docker run --name meta-db-test -p 65433:5432 -v $(pwd)/tests/meta-db/sql:/docker-entrypoint-initdb.d/ -e POSTGRES_USER=postgres -d postgres:9.6.5-alpine
+docker run --name portal-db-test -p 65434:5432 -e POSTGRES_USER=postgres -d postgres:9.6.5-alpine
 
 
 # Get gateway IP