diff --git a/CHANGELOG.md b/CHANGELOG.md
index c6ba3824e37d1a0ee63500121d367378af30d331..269940d78ea3699a6f596a0a4f406ceb6c8905b6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 Upcoming version:
 -----------------
+  - updating geoserver to latest version (Nikolaus Krismer)
   - changing git repo link in contribution guidelines (Nikolaus Krismer)
 
 Version v0.8.0:
diff --git a/bootstrap/prepareEnvironment.sh b/bootstrap/prepareEnvironment.sh
index c3081fb29a37c7f642eb78fd1bc148c18e98e6f0..96c95f5a4af8b0c4c40977bf1eaa3a4816c9c510 100755
--- a/bootstrap/prepareEnvironment.sh
+++ b/bootstrap/prepareEnvironment.sh
@@ -79,7 +79,7 @@ fn_arg2boolean IS_JENKINS_DEPLOY "${3}" "${IS_JENKINS_DEPLOY}"
 GDAL_VERSION="2.1.1"
 GDAL_FILE="gdal-$GDAL_VERSION.tar.gz"
 GDAL_DOWNLOAD_URL="http://download.osgeo.org/gdal/$GDAL_VERSION/$GDAL_FILE"
-GEOSERVER_VERSION="2.9.1"
+GEOSERVER_VERSION="2.10.0"
 GEOSERVER_FILE="geoserver-$GEOSERVER_VERSION-war.zip"
 GEOSERVER_DOWNLOAD_URL="http://sourceforge.net/projects/geoserver/files/GeoServer/$GEOSERVER_VERSION/$GEOSERVER_FILE"
 GEOSERVER_SHELL_VERSION="0.2.1"