diff --git a/fiori/app/admin-fiori.html b/fiori/app/admin-fiori.html
index aa455310..c0e6ddea 100644
--- a/fiori/app/admin-fiori.html
+++ b/fiori/app/admin-fiori.html
@@ -1,41 +1,40 @@
 <!DOCTYPE html>
 <html>
-<head>
+  <head>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Bookshop</title>
 
-	<meta http-equiv="X-UA-Compatible" content="IE=edge" />
-	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
-	<meta name="viewport" content="width=device-width, initial-scale=1.0" />
-	<title>Bookshop</title>
-
-	<script>
-		window["sap-ushell-config"] = {
-			defaultRenderer: "fiori2",
-			applications: {
-				"browse-books": {
-					title: "Browse Books",
-					description: "w/ SAP Fiori Elements",
-					additionalInformation: "SAPUI5.Component=bookshop",
-					applicationType : "URL",
-					url: "/browse/webapp",
-					navigationMode: "embedded"
-				},
-				"manage-books": {
-					title: "Manage Books",
-					description: "w/ SAP Fiori Elements",
-					additionalInformation: "SAPUI5.Component=admin",
-					applicationType : "URL",
-					url: "/admin/webapp",
-					navigationMode: "embedded"
-				},
-				"manage-orders": {
-					title: "Manage Orders",
-					description: "w/ SAP Fiori Elements",
-					additionalInformation: "SAPUI5.Component=orders",
-					applicationType : "URL",
-					url: "/orders/webapp",
-					navigationMode: "embedded"
-				}
-			},
+    <script>
+      window["sap-ushell-config"] = {
+        defaultRenderer: "fiori2",
+        applications: {
+          "browse-books": {
+            title: "Browse Books",
+            description: "w/ SAP Fiori Elements",
+            additionalInformation: "SAPUI5.Component=bookshop",
+            applicationType: "URL",
+            url: "/browse/webapp",
+            navigationMode: "embedded",
+          },
+          "manage-books": {
+            title: "Manage Books",
+            description: "w/ SAP Fiori Elements",
+            additionalInformation: "SAPUI5.Component=admin",
+            applicationType: "URL",
+            url: "/admin/webapp",
+            navigationMode: "embedded",
+          },
+          "manage-orders": {
+            title: "Manage Orders",
+            description: "w/ SAP Fiori Elements",
+            additionalInformation: "SAPUI5.Component=orders",
+            applicationType: "URL",
+            url: "/orders/webapp",
+            navigationMode: "embedded",
+          },
+        },
         bootstrapPlugins: {
           RuntimeAuthoringPlugin: {
             component: "sap.ushell.plugins.rta",
@@ -50,25 +49,33 @@
             },
           },
         },
-		};
-	</script>
+      };
+    </script>
 
-	<script id="sap-ushell-bootstrap" src="https://sapui5nightly.int.sap.eu2.hana.ondemand.com/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
-	<script id="sap-ui-bootstrap" src="https://sapui5nightly.int.sap.eu2.hana.ondemand.com/resources/sap-ui-core.js"
-    	data-sap-ui-libs="sap.m, sap.ushell, sap.collaboration, sap.ui.layout"
-    	data-sap-ui-compatVersion="edge"
-    	data-sap-ui-theme="sap_fiori_3"
-    	data-sap-ui-frameOptions="allow"
-			data-sap-ui-bindingSyntax="complex"
-	></script>
-	<script>
-		sap.ui.getCore().attachInit(()=> sap.ushell.Container.createRenderer().placeAt("content"));
-		sap.ui
+    <script
+      id="sap-ushell-bootstrap"
+      src="https://sapui5nightly.int.sap.eu2.hana.ondemand.com/test-resources/sap/ushell/bootstrap/sandbox.js"
+    ></script>
+    <script
+      id="sap-ui-bootstrap"
+      src="https://sapui5nightly.int.sap.eu2.hana.ondemand.com/resources/sap-ui-core.js"
+      data-sap-ui-libs="sap.m, sap.ushell, sap.collaboration, sap.ui.layout"
+      data-sap-ui-compatVersion="edge"
+      data-sap-ui-theme="sap_fiori_3"
+      data-sap-ui-frameOptions="allow"
+      data-sap-ui-bindingSyntax="complex"
+    ></script>
+    <script>
+      sap.ui
+        .getCore()
+        .attachInit(() =>
+          sap.ushell.Container.createRenderer().placeAt("content")
+        );
+      sap.ui
         .getCore()
         .getConfiguration()
         .setFlexibilityServices([{ connector: "SessionStorageConnector" }]);
-	</script>
-
-</head>
-<body class="sapUiBody" id="content"></body>
-</html>
\ No newline at end of file
+    </script>
+  </head>
+  <body class="sapUiBody" id="content"></body>
+</html>
diff --git a/fiori/app/admin/webapp/manifest.json b/fiori/app/admin/webapp/manifest.json
index 92d7cc7a..74df0757 100644
--- a/fiori/app/admin/webapp/manifest.json
+++ b/fiori/app/admin/webapp/manifest.json
@@ -23,6 +23,9 @@
     },
     "sap.ui5": {
         "flexEnabled": true,
+        "config": {   
+            "experimentalCAPScenario": true
+        },
         "dependencies": {
             "libs": {
                 "sap.fe.templates": {}
diff --git a/fiori/package.json b/fiori/package.json
index 70f23ff7..6e40581e 100644
--- a/fiori/package.json
+++ b/fiori/package.json
@@ -35,9 +35,7 @@
       },
       "db": {
         "kind": "sqlite",
-        "credentials": {
-          "database": "sqlite.db"
-        }
+        "model": "*"
       }
     }
   }
diff --git a/fiori/test.http b/fiori/test.http
index 5cff3ee0..fa8aac45 100644
--- a/fiori/test.http
+++ b/fiori/test.http
@@ -4,7 +4,7 @@ Content-Type: application/json
 
 {
   "extensions": [
-    "{\"extend\":\"AdminService.Books\",\"elements\":{\"ab c\":{\"type\":\"cds.Integer\"}}}"
+    "{\"extend\":\"AdminService.Books\",\"elements\":{\"neuesFeld2\":{\"type\":\"cds.String\", \"default\":\"hallo\"}}}"
   ]
 }
 
diff --git a/orders/app/orders/webapp/manifest.json b/orders/app/orders/webapp/manifest.json
index 7fa112de..4da76b31 100644
--- a/orders/app/orders/webapp/manifest.json
+++ b/orders/app/orders/webapp/manifest.json
@@ -23,6 +23,9 @@
 	},
 	"sap.ui5": {
         "flexEnabled": true,
+        "config": {   
+            "experimentalCAPScenario": true
+        },
         "dependencies": {
             "libs": {
                 "sap.fe.templates": {}
diff --git a/package.json b/package.json
index cdf67de9..447be96f 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "@capire/media": "./media",
     "@capire/orders": "./orders",
     "@capire/reviews": "./reviews",
-    "@sap/cds": "git+https://github.tools.sap/cap/cds.git#runtime/ui-flex-prod",
+    "@sap/cds": "git+https://github.tools.sap/cap/cds.git",
     "@sap/cds-dk": "*"
   },
   "devDependencies": {
