diff --git a/pom.xml b/pom.xml
index 78ea2a0fc..ab2de8e1d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,7 +65,7 @@
     <!-- spring dependencies -->
     <version.javax.annotation-api>1.3.2</version.javax.annotation-api>
     <version.spring.core>2.0.0.RELEASE</version.spring.core>
-    <version.spring.boot>2.4.5</version.spring.boot>
+    <version.spring.boot>2.5.0</version.spring.boot>
     <version.spring.mybatis>2.0.6</version.spring.mybatis>
 
     <!-- wildfly dependencies -->
diff --git a/rest/taskana-rest-spring-example-boot/src/main/resources/application-db2.properties b/rest/taskana-rest-spring-example-boot/src/main/resources/application-db2.properties
index 44d1c024f..7c0f53266 100644
--- a/rest/taskana-rest-spring-example-boot/src/main/resources/application-db2.properties
+++ b/rest/taskana-rest-spring-example-boot/src/main/resources/application-db2.properties
@@ -37,7 +37,7 @@ generateSampleData=true
 ####### JobScheduler cron expression that specifies when the JobSchedler runs
 taskana.jobscheduler.async.cron=0 * * * * *
 ####### cache static resources properties
-spring.resources.cache.cachecontrol.cache-private=true
+spring.web.resources.cache.cachecontrol.cache-private=true
 ####### for upload of big workbasket- or classification-files
 spring.servlet.multipart.max-file-size=10MB
 spring.servlet.multipart.max-request-size=10MB
@@ -49,12 +49,12 @@ server.compression.min-response-size=10240
 
 spring.main.allow-bean-definition-overriding=true
 
-server.tomcat.max-http-post-size=-1
+server.tomcat.max-http-form-post-size=-1
 server.tomcat.max-save-post-size=-1
 server.tomcat.max-swallow-size=-1
 ####### tomcat is not detecting the x-forward headers from bluemix as a trustworthy proxy
-server.tomcat.internal-proxies=.*
-server.use-forward-headers=true
+server.tomcat.remoteip.internal-proxies=.*
+server.forward-headers-strategy=native
 
 ####### Properties for AccessIdController to connect to LDAP
 taskana.ldap.serverUrl=ldap://localhost:10389
diff --git a/rest/taskana-rest-spring-example-boot/src/main/resources/application-postgres.properties b/rest/taskana-rest-spring-example-boot/src/main/resources/application-postgres.properties
index abe77cbdb..232e65401 100644
--- a/rest/taskana-rest-spring-example-boot/src/main/resources/application-postgres.properties
+++ b/rest/taskana-rest-spring-example-boot/src/main/resources/application-postgres.properties
@@ -56,7 +56,7 @@ taskana.ldap.groupsOfUser=memberUid
 ####### JobScheduler cron expression that specifies when the JobSchedler runs
 taskana.jobscheduler.async.cron=0 * * * * *
 ####### cache static resources properties
-spring.resources.cache.cachecontrol.cache-private=true
+spring.web.resources.cache.cachecontrol.cache-private=true
 ####### for upload of big workbasket- or classification-files
 spring.servlet.multipart.max-file-size=10MB
 spring.servlet.multipart.max-request-size=10MB
@@ -73,5 +73,5 @@ server.tomcat.max-http-post-size=-1
 server.tomcat.max-save-post-size=-1
 server.tomcat.max-swallow-size=-1
 ####### tomcat is not detecting the x-forward headers from bluemix as a trustworthy proxy
-server.tomcat.internal-proxies=.*
-server.use-forward-headers=true
+server.tomcat.remoteip.internal-proxies=.*
+server.forward-headers-strategy=native
diff --git a/rest/taskana-rest-spring-example-boot/src/main/resources/application.properties b/rest/taskana-rest-spring-example-boot/src/main/resources/application.properties
index 8c5681bbc..896fd605a 100644
--- a/rest/taskana-rest-spring-example-boot/src/main/resources/application.properties
+++ b/rest/taskana-rest-spring-example-boot/src/main/resources/application.properties
@@ -37,7 +37,7 @@ generateSampleData=true
 ####### JobScheduler cron expression that specifies when the JobSchedler runs
 taskana.jobscheduler.async.cron=0 * * * * *
 ####### cache static resources properties
-spring.resources.cache.cachecontrol.cache-private=true
+spring.web.resources.cache.cachecontrol.cache-private=true
 ####### for upload of big workbasket- or classification-files
 spring.servlet.multipart.max-file-size=10MB
 spring.servlet.multipart.max-request-size=10MB
@@ -49,12 +49,12 @@ server.compression.min-response-size=10240
 
 spring.main.allow-bean-definition-overriding=true
 
-server.tomcat.max-http-post-size=-1
+server.tomcat.max-http-form-post-size=-1
 server.tomcat.max-save-post-size=-1
 server.tomcat.max-swallow-size=-1
 ####### tomcat is not detecting the x-forward headers from bluemix as a trustworthy proxy
-server.tomcat.internal-proxies=.*
-server.use-forward-headers=true
+server.tomcat.remoteip.internal-proxies=.*
+server.forward-headers-strategy=native
 
 ####### Properties for AccessIdController to connect to LDAP
 taskana.ldap.serverUrl=ldap://localhost:10389
diff --git a/rest/taskana-rest-spring-example-common/src/test/resources/application.properties b/rest/taskana-rest-spring-example-common/src/test/resources/application.properties
index 94a2d9366..f00b18f90 100644
--- a/rest/taskana-rest-spring-example-common/src/test/resources/application.properties
+++ b/rest/taskana-rest-spring-example-common/src/test/resources/application.properties
@@ -43,7 +43,7 @@ spring.ldap.embedded.validation.enabled=false
 ####### JobScheduler cron expression that specifies when the JobSchedler runs
 taskana.jobscheduler.async.cron=0 0 * * * *
 ####### cache static resources properties
-spring.resources.cache.cachecontrol.cache-private=true
+spring.web.resources.cache.cachecontrol.cache-private=true
 spring.main.allow-bean-definition-overriding=true
 ####### tomcat is not detecting the x-forward headers from bluemix as a trustworthy proxy
 server.tomcat.remoteip.internal-proxies=.*
diff --git a/rest/taskana-rest-spring/src/test/resources/application.properties b/rest/taskana-rest-spring/src/test/resources/application.properties
index ba3b2947b..9b9775612 100644
--- a/rest/taskana-rest-spring/src/test/resources/application.properties
+++ b/rest/taskana-rest-spring/src/test/resources/application.properties
@@ -44,7 +44,7 @@ spring.jackson.default-property-inclusion=non_null
 ####### JobScheduler cron expression that specifies when the JobSchedler runs
 taskana.jobscheduler.async.cron=0 0 * * * *
 ####### cache static resources properties
-spring.resources.cache.cachecontrol.cache-private=true
+spring.web.resources.cache.cachecontrol.cache-private=true
 spring.main.allow-bean-definition-overriding=true
 ####### tomcat is not detecting the x-forward headers from bluemix as a trustworthy proxy
 server.tomcat.remoteip.internal-proxies=.*