diff --git a/db/package.json b/db/package.json
new file mode 100644
index 00000000..247b99df
--- /dev/null
+++ b/db/package.json
@@ -0,0 +1,12 @@
+{
+  "name": "deploy",
+  "dependencies": {
+    "@sap/hdi-deploy": "^3.8.2"
+  },
+  "engines": {
+    "node": "^8"
+  },
+  "scripts": {
+    "start": "node node_modules/@sap/hdi-deploy/deploy.js"
+  }
+}
diff --git a/mta.yaml b/mta.yaml
new file mode 100644
index 00000000..20934b44
--- /dev/null
+++ b/mta.yaml
@@ -0,0 +1,77 @@
+####### Generated mta.yaml based on template version 0.2.0
+####### appName = capire-samples
+####### language=nodejs; multiTenant=
+####### approuter=
+
+_schema-version: '3.1'
+ID: sap.capire-samples
+version: 1.0.0
+description: "The umbrella project for all samples to easily setup for local development and tests."
+
+build-parameters:
+  before-all:
+   - builder: custom
+     commands:
+      - npm install
+      - cds build/all
+
+parameters:
+  enable-parallel-deployments: true  
+
+modules:
+ ##############    SERVER MODULE   ##########################
+ - name: capire-samples-srv
+   type: nodejs
+   path: 
+   properties:
+     EXIT: 1  # required by deploy.js task to terminate 
+
+   
+   requires:
+    #### Resources extracted from CAP configuration ####
+    - name: capire-samples-db
+    - name: capire-samples-uaa
+
+   provides:
+    - name: srv-binding    # required by consumers of CAP services (e.g. approuter)
+      properties:
+        srv-url: ${default-url}
+
+ ############################################################
+
+ ##############    SIDECAR MODULE   #########################
+ - name: db
+    
+   type: hdb
+   path: gen/db  
+   parameters:
+     app-name: capire-samples-db  
+   requires:
+    #### Hana and xsuaa resources extracted from CAP configuration ####
+    - name: capire-samples-db
+    - name: capire-samples-uaa
+ ############################################################
+
+
+##############  RESOURCES  ##################################
+resources:
+ ##### Services extracted from CAP configuration  ####
+ ##### 'service-plan' can be configured via 'cds.requires.<name>.vcap.plan'
+ - name: capire-samples-db
+   type: com.sap.xs.hdi-container 
+   
+   parameters:
+   properties:
+     hdi-service-name: ${service-name}   # required for Java case
+ - name: capire-samples-uaa
+    
+   type: org.cloudfoundry.managed-service
+   parameters:
+     path: ./xs-security.json
+     service: xsuaa
+     service-plan: application  
+     config:
+       xsappname: capire-samples-${space}    #  name + space dependency
+       tenant-mode: dedicated
+       ### scopes and role templates will be added below by a developer or by CAP tools
+############################################################
diff --git a/package.json b/package.json
index edd10d8f..43528893 100644
--- a/package.json
+++ b/package.json
@@ -1,30 +1,41 @@
 {
-  "name": "@sap/capire-samples",
-  "description": "The umbrella project for all samples to easily setup for local development and tests.",
-  "repository": "https://github.com/SAP-samples/cloud-cap-samples.git",
-  "author": "daniel.hutzel@sap.com",
-  "private": true,
-  "scripts": {
-    "lerna": "npx --no-install lerna -v > /dev/null || npm i lerna --no-save",
-    "install": "(npm -s run lerna) && lerna bootstrap --hoist",
-    "cleanup": "lerna clean -y && rm -fr node_modules",
-    "bookshop": "cds watch packages/bookshop",
-    "bookshop-enhanced": "cds watch packages/bookshop-enhanced",
-    "reviews-service": "cds watch packages/reviews-service",
-    "bookstore": "cds watch packages/bookstore",
-    "media-server": "cds watch packages/media-server"
-  },
-  "dependencies": {
-    "@sap/cds": "latest",
-    "express": "*",
-    "passport": "^0.4.1"
-  },
-  "devDependencies": {
-    "sqlite3": "*"
-  },
-  "--add-these-to-devDependencies-for-tests": {
-    "@types/jest": "*",
-    "jest": "*"
-  },
-  "license": "SAP SAMPLE CODE LICENSE"
+    "name": "@sap/capire-samples",
+    "description": "The umbrella project for all samples to easily setup for local development and tests.",
+    "repository": "https://github.com/SAP-samples/cloud-cap-samples.git",
+    "author": "daniel.hutzel@sap.com",
+    "private": true,
+    "scripts": {
+        "lerna": "npx --no-install lerna -v > /dev/null || npm i lerna --no-save",
+        "install": "(npm -s run lerna) && lerna bootstrap --hoist",
+        "cleanup": "lerna clean -y && rm -fr node_modules",
+        "bookshop": "cds watch packages/bookshop",
+        "bookshop-enhanced": "cds watch packages/bookshop-enhanced",
+        "reviews-service": "cds watch packages/reviews-service",
+        "bookstore": "cds watch packages/bookstore",
+        "media-server": "cds watch packages/media-server"
+    },
+    "dependencies": {
+        "@sap/cds": "latest",
+        "express": "*",
+        "passport": "^0.4.1",
+        "hdb": "^0.17.1"
+    },
+    "devDependencies": {
+        "sqlite3": "*"
+    },
+    "--add-these-to-devDependencies-for-tests": {
+        "@types/jest": "*",
+        "jest": "*"
+    },
+    "license": "SAP SAMPLE CODE LICENSE",
+    "cds": {
+        "requires": {
+            "db": {
+                "kind": "hana"
+            },
+            "uaa": {
+                "kind": "xsuaa"
+             }
+        }
+    }
 }