diff --git a/Dockerfile b/Dockerfile
index 88b75ba..75c416f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@ MAINTAINER GeoNode Development Team
 #
 # Set GeoServer version and data directory
 #
-ENV GEOSERVER_VERSION=2.14.x
+ENV GEOSERVER_VERSION=2.15.x
 ENV GEOSERVER_DATA_DIR="/geoserver_data/data"
 
 #
diff --git a/docker-compose.yml b/docker-compose.yml
index 8761403..43fd27f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '2.2'
 services:
 
   geoserver:
-    image: geonode/geoserver:2.14.x
+    image: geonode/geoserver:2.15.x
     build:
       context: .
       args:
@@ -29,7 +29,7 @@ services:
       - DJANGO_URL=http://localhost/
 
   data_dir_conf:
-    image: geonode/geoserver_data:2.14.x
+    image: geonode/geoserver_data:2.15.x
     container_name: geoserver_data_dir # named data container
     command: /bin/true
     volumes: