diff --git a/docker/Dockerfile b/docker/Dockerfile
index 8731a53827c34da7821df72d308b51a416b84d17..14868e29271cd9606a6c681ce3dc09c99f879b09 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,7 +1,7 @@
 #
 # Build Genesys server on top of jetty-alpine
 #
-FROM jetty:9.4.12
+FROM jetty:9-jre8
 
 LABEL maintainer "Matija Obreza <matija.obreza@croptrust.org>"
 
diff --git a/pom.xml b/pom.xml
index 1fd55f12014deaef8a78b9240202e16cd235fd43..3a42e57fb7c7820314f17fcad35e03e9acbb52b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,7 +97,7 @@
 		<swagger.version>2.9.2</swagger.version>
 
 		<!--Container -->
-		<jetty.version>9.4.12.v20180830</jetty.version>
+		<jetty.version>9.4.20.v20190813</jetty.version>
 
 		<maven.test.skip>false</maven.test.skip>