diff --git a/.gitlab/preview-prefix/kubernetes-resources.yaml b/.gitlab/preview-prefix/kubernetes-resources.yaml
index 0eb5ef83f01d771cbb9705a7f49bacf8b8ea17c1..d85a733e68082785048b06e88667686e3459ca42 100644
--- a/.gitlab/preview-prefix/kubernetes-resources.yaml
+++ b/.gitlab/preview-prefix/kubernetes-resources.yaml
@@ -11,8 +11,10 @@ spec:
   http:
     - match:
         - uri:
-            prefix: /help-documents
+            prefix: /appsuite/help-documents
       name: office-user-guide
+      rewrite:
+        uri: /help-documents
       route:
         - destination:
             host: preview-app-office-user-guide
@@ -20,8 +22,10 @@ spec:
               number: 80
     - match:
         - uri:
-            prefix: /help
+            prefix: /appsuite/help
       name: user-guide
+      rewrite:
+        uri: /help
       route:
         - destination:
             host: preview-app-core-user-guide
diff --git a/.gitlab/preview-prefix/values-template.yaml b/.gitlab/preview-prefix/values-template.yaml
index 5d03dcfc6f2fa839c22efb276e252dda5ec24c6e..9e58d2349069f16d3459b707e1142ed755df62d0 100644
--- a/.gitlab/preview-prefix/values-template.yaml
+++ b/.gitlab/preview-prefix/values-template.yaml
@@ -3,6 +3,11 @@ imagePullSecrets:
 
 appRoot: /appsuite/
 
+podAnnotations:
+  commit-ref: "${CI_COMMIT_SHORT_SHA}"
+deploymentAnnotations:
+  commit-ref: "${CI_COMMIT_SHORT_SHA}"
+
 image:
   registry: ${CI_REGISTRY}
   repository: frontend/ui-middleware