diff --git a/multiapps-controller-web/manifests/manifest.yml b/multiapps-controller-web/manifests/manifest.yml
index fd5e11285d..1f769ad872 100644
--- a/multiapps-controller-web/manifests/manifest.yml
+++ b/multiapps-controller-web/manifests/manifest.yml
@@ -15,9 +15,12 @@ applications:
       VERSION: ${project.version}
       XS_TYPE: CF
       DB_TYPE: POSTGRESQL
-      CATALINA_OPTS: "-Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true"
+      # Encoded forward slashes (%2F) are enabled via the Tomcat connector attribute
+      # encodedSolidusHandling="decode"; the org.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH
+      # system property was removed in Tomcat 11 and has no effect.
+      JBP_CONFIG_RESOURCE_CONFIGURATION: "['tomcat/conf/server.xml': {'connector.encodedSolidusHandling': 'decode'}]"
       JBP_CONFIG_SAP_MACHINE_JRE: '{ jre: { version: "25.+" } }'
-      JBP_CONFIG_TOMCAT: '{ tomcat: { version: 10.+ } }'
+      JBP_CONFIG_TOMCAT: '{ tomcat: { version: 11.+ } }'
       JBP_CONFIG_COMPONENTS: '{jres: ["JavaBuildpack::Jre::SapMachineJRE"]}'
       JAVA_OPTS: '-XX:+HeapDumpOnOutOfMemoryError -XX:MaxDirectMemorySize=192m -Xshare:off -XX:MaxMetaspaceSize=300m -XX:+ErrorFileToStdout -XX:TrimNativeHeapInterval=10000 -Dio.netty.noPreferDirect=true -Dio.netty.maxDirectMemory=0'
       PLATFORM: >