diff --git a/bookstore/package.json b/bookstore/package.json
index 188b472c..87c7ab74 100644
--- a/bookstore/package.json
+++ b/bookstore/package.json
@@ -10,11 +10,11 @@
     "deploy": "cds deploy"
   },
   "dependencies": {
-    "@sap/cds": "3.17.4",
+    "@sap/cds": "3.21.2",
     "@sap/capire-products": "file:sap-capire-products-1.0.0.tgz"
   },
   "devDependencies": {
-    "sqlite3": "^4.1.0"
+    "sqlite3": "^4.1.1"
   },
   "cds": {
     "build": {
diff --git a/bookstore/pom.xml b/bookstore/pom.xml
index e3af3ae8..2caf9591 100644
--- a/bookstore/pom.xml
+++ b/bookstore/pom.xml
@@ -16,9 +16,9 @@
 
 		<!-- DEPENDENCIES VERSION -->
 		<jdk.version>1.8</jdk.version>
-		<cds.services.version>1.0.1</cds.services.version>
-		<cds4j.version>1.2.1</cds4j.version>
-		<spring.boot.version>2.1.7.RELEASE</spring.boot.version>
+		<cds.services.version>1.2.0</cds.services.version>
+		<cds4j.version>1.6.0</cds4j.version>
+		<spring.boot.version>2.2.3.RELEASE</spring.boot.version>
 
 		<node.version>v10.4.1</node.version>
 		<node.url>https://nodejs.org/dist/</node.url>
@@ -128,6 +128,7 @@
 				<version>${spring.boot.version}</version>
 				<configuration>
 					<skip>true</skip>
+					<fork>false</fork>
 				</configuration>
 			</plugin>
 		</plugins>
diff --git a/bookstore/srv/pom.xml b/bookstore/srv/pom.xml
index 1aa7b94a..88cb0b72 100644
--- a/bookstore/srv/pom.xml
+++ b/bookstore/srv/pom.xml
@@ -79,6 +79,7 @@
 				<version>${cds4j.version}</version>
 				<configuration>
 					<outputDirectory>${project.basedir}/src/gen</outputDirectory>
+					<basePackage>cds.gen</basePackage>
 				</configuration>
 				<executions>
 					<execution>
diff --git a/products-service/package.json b/products-service/package.json
index ce04753a..1c03c5e7 100644
--- a/products-service/package.json
+++ b/products-service/package.json
@@ -10,10 +10,10 @@
         "deploy": "cds deploy"
     },
     "dependencies": {
-        "@sap/cds": "3.17.4"
+        "@sap/cds": "3.21.2"
     },
     "devDependencies": {
-        "sqlite3": "^4.1.0"
+        "sqlite3": "^4.1.1"
     },
     "cds": {
         "build": {
diff --git a/products-service/pom.xml b/products-service/pom.xml
index 92f9f9aa..bdab8043 100644
--- a/products-service/pom.xml
+++ b/products-service/pom.xml
@@ -16,9 +16,9 @@
 
 		<!-- DEPENDENCIES VERSION -->
 		<jdk.version>1.8</jdk.version>
-		<cds.services.version>1.0.1</cds.services.version>
-		<cds4j.version>1.2.1</cds4j.version>
-		<spring.boot.version>2.1.7.RELEASE</spring.boot.version>
+		<cds.services.version>1.2.0</cds.services.version>
+		<cds4j.version>1.6.0</cds4j.version>
+		<spring.boot.version>2.2.3.RELEASE</spring.boot.version>
 
 		<node.version>v10.4.1</node.version>
 		<node.url>https://nodejs.org/dist/</node.url>
@@ -128,6 +128,7 @@
 				<version>${spring.boot.version}</version>
 				<configuration>
 					<skip>true</skip>
+					<fork>false</fork>
 				</configuration>
 			</plugin>
 		</plugins>
diff --git a/products-service/srv/pom.xml b/products-service/srv/pom.xml
index b04b95dd..5c87c8aa 100644
--- a/products-service/srv/pom.xml
+++ b/products-service/srv/pom.xml
@@ -79,6 +79,7 @@
 				<version>${cds4j.version}</version>
 				<configuration>
 					<outputDirectory>${project.basedir}/src/gen</outputDirectory>
+					<basePackage>cds.gen</basePackage>
 				</configuration>
 				<executions>
 					<execution>