diff --git a/Tiltfile b/Tiltfile
index 4fefafb..0e23c09 100644
--- a/Tiltfile
+++ b/Tiltfile
@@ -11,12 +11,16 @@ mobility_accounts_dir = os.environ.get('MOBILITY_ACCOUNTS_DIR', 'src/mobility-ac
 agenda_dir = os.environ.get('AGENDA_DIR', 'src/agenda')
 fleets_dir = os.environ.get('FLEETS_DIR', 'src/fleets')
 groups_management_dir = os.environ.get('GROUPS_MANAGEMENT_DIR', 'src/groups-management')
+diags_dir = os.environ.get('DIAGS_DIR', 'src/diags')
+solidarity_service_dir = os.environ.get('SOLIDARITY_SERVICE_DIR', 'src/solidarity-service')
 
 parcoursmob_image = os.environ.get('PARCOURSMOB_IMAGE', 'git.coopgo.io/coopgo-apps/parcoursmob')
 mobility_accounts_image = os.environ.get('MOBILITY_ACCOUNTS_IMAGE', 'git.coopgo.io/coopgo-platform/mobility-accounts')
 agenda_image = os.environ.get('AGENDA_IMAGE', 'git.coopgo.io/coopgo-platform/agenda')
 fleets_image = os.environ.get('FLEETS_IMAGE', 'git.coopgo.io/coopgo-platform/fleets')
 groups_management_image = os.environ.get('GROUPS_MANAGEMENT_IMAGE', 'git.coopgo.io/coopgo-platform/groups-management')
+diags_image = os.environ.get('DIAGS_IMAGE', 'git.coopgo.io/coopgo-platform/diags')
+solidarity_service_image = os.environ.get('SOLIDARITY_SERVICE_IMAGE', 'git.coopgo.io/coopgo-platform/solidarity-service')
 
 k8s_config = os.environ.get('K8S_CONFIG', 'k8s_config/dev')
 smtp4dev_local_port = os.environ.get("SMTP4DEV_LOCAL_PORT", '12345')
@@ -67,6 +71,17 @@ if os.path.exists(groups_management_dir):
     print("Directory : {dir}".format(dir=groups_management_dir))
     deploy_go('groups-management', groups_management_dir, groups_management_image)
 
+if os.path.exists(diags_dir):
+    diags_dir =os.path.realpath(diags_dir)
+    print("DIAGS")
+    print("Directory : {dir}".format(dir=diags_dir))
+    deploy_go('diags', diags_dir, diags_image)
+
+if os.path.exists(solidarity_service_dir):
+    diags_dir =os.path.realpath(solidarity_service_dir)
+    print("SOLIDARITY SERVICE")
+    print("Directory : {dir}".format(dir=solidarity_service_dir))
+    deploy_go('solidarity-service', solidarity_service_dir, solidarity_service_image)
+
 k8s_yaml(kustomize(k8s_config, flags=["--enable-helm"]))
 k8s_resource(workload='smtp4dev', port_forwards=smtp4dev_local_port+":80")
-
diff --git a/k8s_config/dev/diags/config.yaml b/k8s_config/dev/diags/config.yaml
new file mode 100644
index 0000000..85769f3
--- /dev/null
+++ b/k8s_config/dev/diags/config.yaml
@@ -0,0 +1,16 @@
+
+dev_env: true
+
+storage:
+  db:
+    type: mongodb
+    mongodb:
+      host: mongodb
+      port: 27017
+      db_name: coopgo_platform
+      collections:
+        diags: diags
+
+services:
+  grpc:
+    port: 8080
\ No newline at end of file
diff --git a/k8s_config/dev/diags/deployment.yaml b/k8s_config/dev/diags/deployment.yaml
new file mode 100644
index 0000000..9b0c488
--- /dev/null
+++ b/k8s_config/dev/diags/deployment.yaml
@@ -0,0 +1,31 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: diags
+spec:
+  selector:
+    matchLabels:
+      app: diags
+  template:
+    metadata:
+      labels:
+        app: diags
+    spec:
+      containers:
+      - name: diags
+        image: git.coopgo.io/coopgo-platform/diags:dev
+        ports:
+        - name: grpc
+          containerPort: 8080
+          protocol: TCP
+        volumeMounts:
+        - name: diags-config-volume 
+          mountPath: /config.yaml
+          subPath: config.yaml
+      volumes:
+      - name: diags-config-volume 
+        configMap:
+          name: diags-config
+          items:
+            - key: config.yaml
+              path: config.yaml
diff --git a/k8s_config/dev/diags/kustomization.yaml b/k8s_config/dev/diags/kustomization.yaml
new file mode 100644
index 0000000..c525965
--- /dev/null
+++ b/k8s_config/dev/diags/kustomization.yaml
@@ -0,0 +1,8 @@
+resources:
+- deployment.yaml 
+- service.yaml 
+
+configMapGenerator:
+- name: diags-config
+  files:
+    - config.yaml
\ No newline at end of file
diff --git a/k8s_config/dev/diags/service.yaml b/k8s_config/dev/diags/service.yaml
new file mode 100644
index 0000000..0dbfc09
--- /dev/null
+++ b/k8s_config/dev/diags/service.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: diags
+spec:
+  selector:
+    app: diags
+  ports:
+  - port: 8080
+    name: grpc
+    targetPort: 8080
diff --git a/k8s_config/dev/kustomization.yaml b/k8s_config/dev/kustomization.yaml
index 2903014..95101c8 100644
--- a/k8s_config/dev/kustomization.yaml
+++ b/k8s_config/dev/kustomization.yaml
@@ -6,6 +6,8 @@ resources:
   - ./fleets/
   - ./groups-management/
   - ./mobility-accounts/
+  - ./diags/
+  - ./solidarity-service/
 
   # Apps
   - ./parcoursmob/
@@ -17,4 +19,3 @@ resources:
   - ./smtp4dev/
   - ./formance/
   - namespace.yaml
-
diff --git a/k8s_config/dev/mongodb/create_db.js b/k8s_config/dev/mongodb/create_db.js
index c9d2818..b8806da 100644
--- a/k8s_config/dev/mongodb/create_db.js
+++ b/k8s_config/dev/mongodb/create_db.js
@@ -50,7 +50,8 @@ db.groups.insert({
             "vehicles" : true,
             "support" : true,
             "beneficiaries" : true,
-            "journeys" : true
+            "journeys" : true,
+            "diags" : true
         },
         "name" : "COOPGO"
     }
diff --git a/k8s_config/dev/parcoursmob/config.yaml b/k8s_config/dev/parcoursmob/config.yaml
index cba3f9f..ec2cc0f 100644
--- a/k8s_config/dev/parcoursmob/config.yaml
+++ b/k8s_config/dev/parcoursmob/config.yaml
@@ -30,6 +30,8 @@ services:
       dial: fleets:8080
     agenda:
       dial: agenda:8080
+    diags:
+      dial: diags:8080
   navitia:
     api_key: abcd
 
@@ -102,6 +104,9 @@ modules:
       - name: Auto-école sociale (classique)
       - name: Information collective
       - name: Autre
-
+    documents_types:
+      - notice
+      - pieces
+      - other
 #  knowledge:
 #    enabled: true
diff --git a/k8s_config/dev/parcoursmob/deployment.yaml b/k8s_config/dev/parcoursmob/deployment.yaml
index e7e0a19..62f8e8d 100644
--- a/k8s_config/dev/parcoursmob/deployment.yaml
+++ b/k8s_config/dev/parcoursmob/deployment.yaml
@@ -13,7 +13,7 @@ spec:
     spec:
       containers:
       - name: parcoursmob
-        image: git.coopgo.io/coopgo-apps/parcoursmob
+        image: git.coopgo.io/coopgo-apps/parcoursmob:dev
         ports:
         - containerPort: 80
         volumeMounts:
diff --git a/k8s_config/dev/postgresql/kustomization.yaml b/k8s_config/dev/postgresql/kustomization.yaml
new file mode 100644
index 0000000..e69de29
diff --git a/k8s_config/dev/solidarity-service/config.yaml b/k8s_config/dev/solidarity-service/config.yaml
new file mode 100644
index 0000000..f48d63e
--- /dev/null
+++ b/k8s_config/dev/solidarity-service/config.yaml
@@ -0,0 +1,22 @@
+dev_env: true
+
+storage:
+  db:
+    type: mongodb
+    mongodb:
+      host: mongodb
+      port: 27017
+      db_name: coopgo_platform
+      collections:
+        drivers: solidarity_drivers
+        passengers: solidarity_passengers
+        bookings: solidarity_bookings
+
+services:
+  grpc:
+    port: 8080
+
+routing:
+  type: valhalla
+  valhalla:
+    base_url: https://valhalla.coopgo.io/
diff --git a/k8s_config/dev/solidarity-service/deployment.yaml b/k8s_config/dev/solidarity-service/deployment.yaml
new file mode 100644
index 0000000..3670dfd
--- /dev/null
+++ b/k8s_config/dev/solidarity-service/deployment.yaml
@@ -0,0 +1,31 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: solidarity-service
+spec:
+  selector:
+    matchLabels:
+      app: solidarity-service
+  template:
+    metadata:
+      labels:
+        app: solidarity-service
+    spec:
+      containers:
+        - name: solidarity-service
+          image: coopgo-platform/solidarity-service
+          ports:
+            - name: grpc
+              containerPort: 8080
+              protocol: TCP
+          volumeMounts:
+            - name: solidarity-service-config-volume
+              mountPath: /config.yaml
+              subPath: config.yaml
+      volumes:
+        - name: solidarity-service-config-volume
+          configMap:
+            name: solidarity-service-config
+            items:
+              - key: config.yaml
+                path: config.yaml
diff --git a/k8s_config/dev/solidarity-service/kustomization.yaml b/k8s_config/dev/solidarity-service/kustomization.yaml
new file mode 100644
index 0000000..9d5c26d
--- /dev/null
+++ b/k8s_config/dev/solidarity-service/kustomization.yaml
@@ -0,0 +1,9 @@
+resources:
+  - deployment.yaml
+  - service.yaml
+
+configMapGenerator:
+  - name: solidarity-service-config
+    files:
+      - config.yaml
+
diff --git a/k8s_config/dev/solidarity-service/service.yaml b/k8s_config/dev/solidarity-service/service.yaml
new file mode 100644
index 0000000..6465514
--- /dev/null
+++ b/k8s_config/dev/solidarity-service/service.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: solidarity-service
+spec:
+  selector:
+    app: solidarity-service
+  ports:
+    - port: 8080
+      name: grpc
+      targetPort: 8080