diff --git a/packages/bookshop/app/admin/webapp/Component.js b/packages/bookshop/app/admin/webapp/Component.js
index 9fdf2d05..29de9d8a 100644
--- a/packages/bookshop/app/admin/webapp/Component.js
+++ b/packages/bookshop/app/admin/webapp/Component.js
@@ -1,4 +1,4 @@
-sap.ui.define(["sap/fe/AppComponent"], ac => ac.extend("admin.Component", {
+sap.ui.define(["sap/fe/core/AppComponent"], ac => ac.extend("admin.Component", {
     metadata:{ manifest:'json' }
 }))
 
diff --git a/packages/bookshop/app/admin/webapp/manifest.json b/packages/bookshop/app/admin/webapp/manifest.json
index 574480f1..27dd858f 100644
--- a/packages/bookshop/app/admin/webapp/manifest.json
+++ b/packages/bookshop/app/admin/webapp/manifest.json
@@ -24,7 +24,9 @@
     "sap.ui5": {
         "dependencies": {
             "libs": {
-                "sap.fe": {}
+                "sap.fe.core": {},
+                "sap.fe.macros": {},
+                "sap.fe.templates": {}
             }
         },
         "models": {
diff --git a/packages/bookshop/app/browse/webapp/Component.js b/packages/bookshop/app/browse/webapp/Component.js
index e46ce759..53407852 100644
--- a/packages/bookshop/app/browse/webapp/Component.js
+++ b/packages/bookshop/app/browse/webapp/Component.js
@@ -1,4 +1,4 @@
-sap.ui.define(["sap/fe/AppComponent"], ac => ac.extend("bookshop.Component", {
+sap.ui.define(["sap/fe/core/AppComponent"], ac => ac.extend("bookshop.Component", {
     metadata:{ manifest:'json' }
 }))
 
diff --git a/packages/bookshop/app/browse/webapp/manifest.json b/packages/bookshop/app/browse/webapp/manifest.json
index 4212312e..d6a6391c 100644
--- a/packages/bookshop/app/browse/webapp/manifest.json
+++ b/packages/bookshop/app/browse/webapp/manifest.json
@@ -24,7 +24,9 @@
   "sap.ui5": {
     "dependencies": {
       "libs": {
-        "sap.fe": {}
+        "sap.fe.core": {},
+        "sap.fe.macros": {},
+         "sap.fe.templates": {}
       }
     },
     "models": {
diff --git a/packages/bookshop/app/orders/webapp/Component.js b/packages/bookshop/app/orders/webapp/Component.js
index e40eb3be..2ee98212 100644
--- a/packages/bookshop/app/orders/webapp/Component.js
+++ b/packages/bookshop/app/orders/webapp/Component.js
@@ -1,4 +1,4 @@
-sap.ui.define(["sap/fe/AppComponent"], ac => ac.extend("orders.Component", {
+sap.ui.define(["sap/fe/core/AppComponent"], ac => ac.extend("orders.Component", {
     metadata:{ manifest:'json' }
 }))
 
diff --git a/packages/bookshop/app/orders/webapp/manifest.json b/packages/bookshop/app/orders/webapp/manifest.json
index e33eb24b..cbaf22f1 100644
--- a/packages/bookshop/app/orders/webapp/manifest.json
+++ b/packages/bookshop/app/orders/webapp/manifest.json
@@ -24,7 +24,9 @@
 	"sap.ui5": {
         "dependencies": {
             "libs": {
-                "sap.fe": {}
+                "sap.fe.core": {},
+                "sap.fe.macros": {},
+                "sap.fe.templates": {}
             }
         },
 		"models": {