diff --git a/Dockerfile b/Dockerfile
index 859476516a19b99d1fa81eb29869a3440431aeef..330ed5a922bfd9ce1d30303e7488c0c358e512d7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:8u121-jre-alpine
+FROM openjdk:8u131-jre-alpine
 MAINTAINER Mirco Nasuti <mirco.nasuti@chuv.ch>
 
 ARG BUILD_DATE
diff --git a/tests/pre-test-run.sh b/tests/pre-test-run.sh
index 01e97cc7e1983a67ac4055aeecb221663dcc7c1e..6835825b7bd4e1e6e2daec43863734a9d2ca2459 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.5.3
-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.5.3
-docker run --name portal-db-test -p 65434:5432 -e POSTGRES_USER=postgres -d postgres:9.5.3
+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
 
 
 # Get gateway IP