diff --git a/test/files/expectedChart/values.yaml b/test/files/expectedChart/values.yaml
index 0fe28c5..3b72e0e 100644
--- a/test/files/expectedChart/values.yaml
+++ b/test/files/expectedChart/values.yaml
@@ -11,6 +11,22 @@ serviceInstances:
           - instance-secret
           - binding-secret
         redirect-uris: []
+  saas-registry:
+    name: bookshop-saas-registry
+    serviceOfferingName: saas-registry
+    servicePlanName: application
+    parameters:
+      plan: general
+      appUrls:
+        callbackTimeoutMillis: 300000
+        onSubscriptionAsync: true
+        onUnSubscriptionAsync: true
+      category: CAP
+  service-manager:
+    name: bookshop-service-manager
+    serviceOfferingName: service-manager
+    servicePlanName: container
+    parameters: {}
 serviceBindings:
   xsuaa:
     name: bookshop-uaa-bind
@@ -18,6 +34,18 @@ serviceBindings:
     secretName: bookshop-uaa-bind-secret
     secretKey: credentials
     parameters: {}
+  saas-registry:
+    name: bookshop-saas-registry-bind
+    serviceInstanceName: bookshop-saas-registry
+    secretName: bookshop-saas-registry-bind-secret
+    secretKey: credentials
+    parameters: {}
+  service-manager:
+    name: bookshop-service-manager-bind
+    serviceInstanceName: bookshop-service-manager
+    secretName: bookshop-service-manager-bind-secret
+    secretKey: credentials
+    parameters: {}
 app:
   domains:
     primary: null
@@ -44,6 +72,17 @@ workloads:
       ports:
         - name: router-port
           port: 5000
+  server:
+    name: server
+    labels:
+      sme.sap.com/app-type: bookshop
+    consumedBTPServices:
+      - bookshop-uaa-bind
+      - bookshop-saas-registry-bind
+      - bookshop-service-manager-bind
+    deploymentDefinition:
+      type: CAP
+      image: null
 tenantOperations:
   provisioning: []
   upgrade: []
diff --git a/test/files/expectedChart/valuesWithDestination.yaml b/test/files/expectedChart/valuesWithDestination.yaml
index e397a64..4c4c156 100644
--- a/test/files/expectedChart/valuesWithDestination.yaml
+++ b/test/files/expectedChart/valuesWithDestination.yaml
@@ -11,6 +11,22 @@ serviceInstances:
           - instance-secret
           - binding-secret
         redirect-uris: []
+  saas-registry:
+    name: bookshop-saas-registry
+    serviceOfferingName: saas-registry
+    servicePlanName: application
+    parameters:
+      plan: general
+      appUrls:
+        callbackTimeoutMillis: 300000
+        onSubscriptionAsync: true
+        onUnSubscriptionAsync: true
+      category: CAP
+  service-manager:
+    name: bookshop-service-manager
+    serviceOfferingName: service-manager
+    servicePlanName: container
+    parameters: {}
   destination:
     name: bookshop-destination
     serviceOfferingName: destination
@@ -24,6 +40,18 @@ serviceBindings:
     secretName: bookshop-uaa-bind-secret
     secretKey: credentials
     parameters: {}
+  saas-registry:
+    name: bookshop-saas-registry-bind
+    serviceInstanceName: bookshop-saas-registry
+    secretName: bookshop-saas-registry-bind-secret
+    secretKey: credentials
+    parameters: {}
+  service-manager:
+    name: bookshop-service-manager-bind
+    serviceInstanceName: bookshop-service-manager
+    secretName: bookshop-service-manager-bind-secret
+    secretKey: credentials
+    parameters: {}
   destination:
     name: bookshop-destination-bind
     serviceInstanceName: bookshop-destination
@@ -57,6 +85,18 @@ workloads:
       ports:
         - name: router-port
           port: 5000
+  server:
+    name: server
+    labels:
+      sme.sap.com/app-type: bookshop
+    consumedBTPServices:
+      - bookshop-uaa-bind
+      - bookshop-destination-bind
+      - bookshop-saas-registry-bind
+      - bookshop-service-manager-bind
+    deploymentDefinition:
+      type: CAP
+      image: null
 tenantOperations:
   provisioning: []
   upgrade: []
diff --git a/test/files/expectedChart/valuesWithMTA.yaml b/test/files/expectedChart/valuesWithMTA.yaml
index cd8cf0b..3f00256 100644
--- a/test/files/expectedChart/valuesWithMTA.yaml
+++ b/test/files/expectedChart/valuesWithMTA.yaml
@@ -55,18 +55,6 @@ serviceInstances:
     serviceOfferingName: application-logs
     servicePlanName: standard
     parameters: {}
-  xsuaa:
-    name: bookshop-uaa
-    serviceOfferingName: xsuaa
-    servicePlanName: broker
-    parameters:
-      xsappname: bookshop
-      tenant-mode: shared
-      oauth2-configuration:
-        credential-types:
-          - instance-secret
-          - binding-secret
-        redirect-uris: []
 serviceBindings:
   author-readings-uaa-bind:
     name: author-readings-uaa-bind
@@ -123,12 +111,6 @@ serviceBindings:
     secretKey: credentials
     secretName: author-readings-html5-repo-host-bind-secret
     serviceInstanceName: author-readings-html5-repo-host
-  xsuaa:
-    name: bookshop-uaa-bind
-    serviceInstanceName: bookshop-uaa
-    secretName: bookshop-uaa-bind-secret
-    secretKey: credentials
-    parameters: {}
 app:
   domains:
     primary: null
@@ -223,18 +205,6 @@ workloads:
       env:
         - name: TENANT_HOST_PATTERN
           value: ^(.*)-${default-uri}
-  app-router:
-    name: app-router
-    labels:
-      sme.sap.com/app-type: bookshop
-    consumedBTPServices:
-      - bookshop-uaa-bind
-    deploymentDefinition:
-      type: Router
-      image: null
-      ports:
-        - name: router-port
-          port: 5000
 tenantOperations:
   provisioning: []
   upgrade: []
diff --git a/test/files/expectedChart/valuesWithXsuaaDestinationRouter.yaml b/test/files/expectedChart/valuesWithXsuaaDestinationRouter.yaml
index 7ceaf72..f65f6fe 100644
--- a/test/files/expectedChart/valuesWithXsuaaDestinationRouter.yaml
+++ b/test/files/expectedChart/valuesWithXsuaaDestinationRouter.yaml
@@ -17,6 +17,22 @@ serviceInstances:
           - instance-secret
           - binding-secret
         redirect-uris: []
+  saas-registry:
+    name: bookshop-saas-registry
+    serviceOfferingName: saas-registry
+    servicePlanName: application
+    parameters:
+      plan: general
+      appUrls:
+        callbackTimeoutMillis: 300000
+        onSubscriptionAsync: true
+        onUnSubscriptionAsync: true
+      category: CAP
+  service-manager:
+    name: bookshop-service-manager
+    serviceOfferingName: service-manager
+    servicePlanName: container
+    parameters: {}
 serviceBindings:
   destination:
     name: bookshop-destination-bind
@@ -30,6 +46,18 @@ serviceBindings:
     secretName: bookshop-uaa-bind-secret
     secretKey: credentials
     parameters: {}
+  saas-registry:
+    name: bookshop-saas-registry-bind
+    serviceInstanceName: bookshop-saas-registry
+    secretName: bookshop-saas-registry-bind-secret
+    secretKey: credentials
+    parameters: {}
+  service-manager:
+    name: bookshop-service-manager-bind
+    serviceInstanceName: bookshop-service-manager
+    secretName: bookshop-service-manager-bind-secret
+    secretKey: credentials
+    parameters: {}
 app:
   domains:
     primary: null
@@ -57,6 +85,18 @@ workloads:
       ports:
         - name: router-port
           port: 5000
+  server:
+    name: server
+    labels:
+      sme.sap.com/app-type: bookshop
+    consumedBTPServices:
+      - bookshop-uaa-bind
+      - bookshop-destination-bind
+      - bookshop-saas-registry-bind
+      - bookshop-service-manager-bind
+    deploymentDefinition:
+      type: CAP
+      image: null
 tenantOperations:
   provisioning: []
   upgrade: []