diff --git a/devops/stacks/plone.org.yml b/devops/stacks/plone.org.yml
index bd886cc..4958461 100644
--- a/devops/stacks/plone.org.yml
+++ b/devops/stacks/plone.org.yml
@@ -54,6 +54,8 @@ services:
         ### Authentication
         - traefik.http.middlewares.ploneorg-backend-auth.basicauth.users=ploneorg:$$apr1$$SAOhBRqM$$HqoYLlr//h7PfUWidoFg//
         ### backend ++api++ VHM
+        - "traefik.http.middlewares.ploneorg-vhm-cleanup.replacepathregex.regex=^/((\\+\\+api\\+\\+\/){1,})($$|.*)"
+        - "traefik.http.middlewares.ploneorg-vhm-cleanup.replacepathregex.replacement=/VirtualHostBase/https/plone.org/Plone/++api++/VirtualHostRoot/$$3"
         - "traefik.http.middlewares.ploneorg-vhm.replacepathregex.regex=^/\\+\\+api\\+\\+($$|/.*)"
         - "traefik.http.middlewares.ploneorg-vhm.replacepathregex.replacement=/VirtualHostBase/https/plone.org/Plone/++api++/VirtualHostRoot/$$1"
         ### backend /ClassicUI VHM
@@ -65,7 +67,7 @@ services:
         - traefik.http.routers.ploneorg-backend.entrypoints=https
         - traefik.http.routers.ploneorg-backend.tls=true
         - traefik.http.routers.ploneorg-backend.service=ploneorg-backend
-        - traefik.http.routers.ploneorg-backend.middlewares=gzip,ploneorg-vhm
+        - traefik.http.routers.ploneorg-backend.middlewares=gzip,ploneorg-vhm-cleanup,ploneorg-vhm
         ### Plone.org /ClassicUI - protected with basic auth (prevent SEOs from crawl it)
         - traefik.http.routers.ploneorg-classicui.rule=Host(`plone.org`) && (PathPrefix(`/ClassicUI`))
         - traefik.http.routers.ploneorg-classicui.entrypoints=https