diff --git a/fiori/app/admin-fiori.html b/fiori/app/admin-fiori.html
index 6c229e6b..aa455310 100644
--- a/fiori/app/admin-fiori.html
+++ b/fiori/app/admin-fiori.html
@@ -35,19 +35,38 @@
 					url: "/orders/webapp",
 					navigationMode: "embedded"
 				}
-			}
+			},
+        bootstrapPlugins: {
+          RuntimeAuthoringPlugin: {
+            component: "sap.ushell.plugins.rta",
+            config: {
+              validateAppVersion: false,
+            },
+          },
+          PersonalizePlugin: {
+            component: "sap.ushell.plugins.rta-personalize",
+            config: {
+              validateAppVersion: false,
+            },
+          },
+        },
 		};
 	</script>
 
-	<script id="sap-ushell-bootstrap" src="https://sapui5.hana.ondemand.com/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
-	<script id="sap-ui-bootstrap" src="https://sapui5.hana.ondemand.com/resources/sap-ui-core.js"
+	<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().attachInit(()=> sap.ushell.Container.createRenderer().placeAt("content"));
+		sap.ui
+        .getCore()
+        .getConfiguration()
+        .setFlexibilityServices([{ connector: "SessionStorageConnector" }]);
 	</script>
 
 </head>
diff --git a/fiori/app/admin/webapp/manifest.json b/fiori/app/admin/webapp/manifest.json
index 25047c29..92d7cc7a 100644
--- a/fiori/app/admin/webapp/manifest.json
+++ b/fiori/app/admin/webapp/manifest.json
@@ -22,6 +22,7 @@
         }
     },
     "sap.ui5": {
+        "flexEnabled": true,
         "dependencies": {
             "libs": {
                 "sap.fe.templates": {}
diff --git a/fiori/app/browse/webapp/manifest.json b/fiori/app/browse/webapp/manifest.json
index 4a2e0a62..d89cc77c 100644
--- a/fiori/app/browse/webapp/manifest.json
+++ b/fiori/app/browse/webapp/manifest.json
@@ -22,6 +22,7 @@
     }
   },
   "sap.ui5": {
+    "flexEnabled": true,
     "dependencies": {
       "libs": {
         "sap.fe.templates": {}
diff --git a/orders/app/fiori-app.html b/orders/app/fiori-app.html
index 3f1640fe..7276dc71 100644
--- a/orders/app/fiori-app.html
+++ b/orders/app/fiori-app.html
@@ -19,19 +19,38 @@
 					url: "/orders/webapp",
 					navigationMode: "embedded"
 				}
-			}
+			},
+			bootstrapPlugins: {
+          RuntimeAuthoringPlugin: {
+            component: "sap.ushell.plugins.rta",
+            config: {
+              validateAppVersion: false,
+            },
+          },
+          PersonalizePlugin: {
+            component: "sap.ushell.plugins.rta-personalize",
+            config: {
+              validateAppVersion: false,
+            },
+          },
+        },
 		};
 	</script>
 
-	<script id="sap-ushell-bootstrap" src="https://sapui5.hana.ondemand.com/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
-	<script id="sap-ui-bootstrap" src="https://sapui5.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"
-	></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.getCore().attachInit(()=> sap.ushell.Container.createRenderer().placeAt("content"));
+		sap.ui
+        .getCore()
+        .getConfiguration()
+        .setFlexibilityServices([{ connector: "SessionStorageConnector" }]);
 	</script>
 
 </head>
diff --git a/orders/app/orders/webapp/manifest.json b/orders/app/orders/webapp/manifest.json
index 045fa70a..7fa112de 100644
--- a/orders/app/orders/webapp/manifest.json
+++ b/orders/app/orders/webapp/manifest.json
@@ -22,6 +22,7 @@
 		}
 	},
 	"sap.ui5": {
+        "flexEnabled": true,
         "dependencies": {
             "libs": {
                 "sap.fe.templates": {}