diff --git a/Dockerfile b/Dockerfile
index 6b5240240a5fd63accb4ff93003d807f94cc5a4c..62f9a2624c15b95cc1bd6a3c01c611eac279e15e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Build stage for Java classes
-FROM hbpmip/java-base-build:3.5.0-jdk-8-9 as java-build-env
+FROM hbpmip/java-base-build:3.5.2-jdk-8-0 as java-build-env
 
 COPY pom.xml /project/
 
@@ -12,7 +12,7 @@ COPY src/ /project/src/
 RUN cp /usr/share/maven/ref/settings-docker.xml /root/.m2/settings.xml \
     && mvn clean package
 
-FROM hbpmip/java-base:8u151-0
+FROM hbpmip/java-base:8u151-1
 MAINTAINER Mirco Nasuti <mirco.nasuti@chuv.ch>
 
 ARG BUILD_DATE
diff --git a/tests/docker-compose.yml b/tests/docker-compose.yml
index 6de4a32f2a4e7c5b3735663481fb66e5d913c67f..034d283e4764477e7afc401733b4f609f562fcd9 100644
--- a/tests/docker-compose.yml
+++ b/tests/docker-compose.yml
@@ -43,7 +43,7 @@ services:
       - db
 
   meta_db_setup:
-    image: "hbpmip/sample-meta-db-setup:0.3.1"
+    image: "hbpmip/sample-meta-db-setup:0.4.1"
     container_name: "meta-db-setup"
     restart: "no"
     networks: