diff --git a/examples/array-datatype/AppManifest.json b/examples/array-datatype/AppManifest.json
index ec24ab9c..3c8d26c3 100644
--- a/examples/array-datatype/AppManifest.json
+++ b/examples/array-datatype/AppManifest.json
@@ -10,23 +10,11 @@
                     "required": [
                         {
                             "path": "Vehicle.Powertrain.FuelSystem.SupportedFuel",
-                            "optional": "false",
                             "access": "read"
                         }
                     ]
                 }
             }
-        },
-        {
-            "type": "grpc-interface",
-            "config": {
-                "src": "https://github.com/eclipse/kuksa.val/blob/master/kuksa_databroker/proto/sdv/databroker/v1/broker.proto",
-                "required": {
-                    "methods": [
-                        "Subscribe"
-                    ]
-                }
-            }
         }
     ]
 }
diff --git a/examples/atomic-set/AppManifest.json b/examples/atomic-set/AppManifest.json
index c0819d2c..791aaec8 100644
--- a/examples/atomic-set/AppManifest.json
+++ b/examples/atomic-set/AppManifest.json
@@ -10,30 +10,16 @@
                     "required": [
                         {
                             "path": "Vehicle.Cabin.Seat.Row1.Pos1.Position",
-                            "optional": "false",
                             "access": "write"
                         },
                         {
                             "path": "Vehicle.Cabin.Seat.Row1.Pos2.Position",
-                            "optional": "false",
                             "access": "write"
                         }
                     ]
                 }
             }
         },
-        {
-            "type": "grpc-interface",
-            "config": {
-                "src": "https://github.com/eclipse/kuksa.val/blob/master/kuksa_databroker/proto/sdv/databroker/v1/broker.proto",
-                "required": {
-                    "methods": [
-                        "SetDatapoints",
-                        "Subscribe"
-                    ]
-                }
-            }
-        },
         {
             "type": "pubsub",
             "config": {
diff --git a/examples/datapoint-set/AppManifest.json b/examples/datapoint-set/AppManifest.json
index c63c7114..53dffd34 100644
--- a/examples/datapoint-set/AppManifest.json
+++ b/examples/datapoint-set/AppManifest.json
@@ -10,30 +10,16 @@
                     "required": [
                         {
                             "path": "Vehicle.Cabin.Seat.Row1.Pos1.IsBelted",
-                            "optional": "false",
                             "access": "write"
                         },
                         {
                             "path": "Vehicle.Cabin.Seat.Row1.Pos1.Position",
-                            "optional": "false",
                             "access": "write"
                         }
                     ]
                 }
             }
         },
-        {
-            "type": "grpc-interface",
-            "config": {
-                "src": "https://github.com/eclipse/kuksa.val/blob/master/kuksa_databroker/proto/sdv/databroker/v1/broker.proto",
-                "required": {
-                    "methods": [
-                        "SetDatapoints",
-                        "Subscribe"
-                    ]
-                }
-            }
-        },
         {
             "type": "pubsub",
             "config": {
diff --git a/examples/dog-mode/AppManifest.json b/examples/dog-mode/AppManifest.json
index 3c25ca75..183becb0 100644
--- a/examples/dog-mode/AppManifest.json
+++ b/examples/dog-mode/AppManifest.json
@@ -10,22 +10,18 @@
                     "required": [
                         {
                             "path": "Vehicle.Cabin.AmbientAirTemperature",
-                            "optional": "false",
                             "access": "read"
                         },
                         {
                             "path": "Vehicle.Cabin.DogMode",
-                            "optional": "false",
                             "access": "read"
                         },
                         {
                             "path": "Vehicle.Cabin.DogModeTemperature",
-                            "optional": "false",
                             "access": "read"
                         },
                         {
                             "path": "Vehicle.Powertrain.Battery.StateOfCharge.Current",
-                            "optional": "false",
                             "access": "read"
                         }
                     ]
@@ -35,18 +31,7 @@
         {
             "type": "grpc-interface",
             "config": {
-                "src": "https://github.com/eclipse/kuksa.val/blob/master/kuksa_databroker/proto/sdv/databroker/v1/broker.proto",
-                "required": {
-                    "methods": [
-                        "Subscribe"
-                    ]
-                }
-            }
-        },
-        {
-            "type": "grpc-interface",
-            "config": {
-                "src": "https://github.com/eclipse/kuksa.val.services/blob/main/hvac_service/proto/sdv/edge/comfort/hvac/v1/hvac.proto",
+                "src": "https://github.com/eclipse/kuksa.val.services/blob/v0.2.0/hvac_service/proto/sdv/edge/comfort/hvac/v1/hvac.proto",
                 "required": {
                     "methods": [
                         "SetAcStatus",
diff --git a/examples/dynamic-rule/AppManifest.json b/examples/dynamic-rule/AppManifest.json
index f1fe9ced..eac718f7 100644
--- a/examples/dynamic-rule/AppManifest.json
+++ b/examples/dynamic-rule/AppManifest.json
@@ -10,34 +10,20 @@
                     "required": [
                         {
                             "path": "Vehicle.Speed",
-                            "optional": "false",
                             "access": "read"
                         },
                         {
                             "path": "Vehicle.ADAS.ABS.IsEnabled",
-                            "optional": "false",
                             "access": "read"
                         },
                         {
                             "path": "Vehicle.ADAS.ABS.IsEngaged",
-                            "optional": "false",
                             "access": "read"
                         }
                     ]
                 }
             }
         },
-        {
-            "type": "grpc-interface",
-            "config": {
-                "src": "https://github.com/eclipse/kuksa.val/blob/master/kuksa_databroker/proto/sdv/databroker/v1/broker.proto",
-                "required": {
-                    "methods": [
-                        "Subscribe"
-                    ]
-                }
-            }
-        },
         {
             "type": "pubsub",
             "config": {
diff --git a/examples/seat-adjuster/AppManifest.json b/examples/seat-adjuster/AppManifest.json
index 98320cfe..d0db9b4d 100644
--- a/examples/seat-adjuster/AppManifest.json
+++ b/examples/seat-adjuster/AppManifest.json
@@ -10,31 +10,16 @@
                     "required": [
                         {
                             "path": "Vehicle.Cabin.Seat.Row1.Pos1.Position",
-                            "optional": "false",
                             "access": "write"
                         },
                         {
                             "path": "Vehicle.Speed",
-                            "optional": "false",
                             "access": "read"
                         }
                     ]
                 }
             }
         },
-        {
-            "type": "grpc-interface",
-            "config": {
-                "src": "https://github.com/eclipse/kuksa.val/blob/master/kuksa_databroker/proto/sdv/databroker/v1/broker.proto",
-                "required": {
-                    "methods": [
-                        "GetDatapoints",
-                        "SetDatapoints",
-                        "Subscribe"
-                    ]
-                }
-            }
-        },
         {
             "type": "pubsub",
             "config": {
diff --git a/examples/static-rule/AppManifest.json b/examples/static-rule/AppManifest.json
index f3f0e0b7..d77bcf79 100644
--- a/examples/static-rule/AppManifest.json
+++ b/examples/static-rule/AppManifest.json
@@ -10,23 +10,11 @@
                     "required": [
                         {
                             "path": "Vehicle.Speed",
-                            "optional": "false",
                             "access": "read"
                         }
                     ]
                 }
             }
         },
-        {
-            "type": "grpc-interface",
-            "config": {
-                "src": "https://github.com/eclipse/kuksa.val/blob/master/kuksa_databroker/proto/sdv/databroker/v1/broker.proto",
-                "required": {
-                    "methods": [
-                        "Subscribe"
-                    ]
-                }
-            }
-        }
     ]
 }
diff --git a/examples/vdb-queries/AppManifest.json b/examples/vdb-queries/AppManifest.json
index 79f831e8..7cbfbd4f 100644
--- a/examples/vdb-queries/AppManifest.json
+++ b/examples/vdb-queries/AppManifest.json
@@ -10,29 +10,15 @@
                     "required": [
                         {
                             "path": "Vehicle.Cabin.Seat.Row1.Pos1.Position",
-                            "optional": "false",
                             "access": "read"
                         },
                         {
                             "path": "Vehicle.Speed",
-                            "optional": "false",
                             "access": "read"
                         }
                     ]
                 }
             }
         },
-        {
-            "type": "grpc-interface",
-            "config": {
-                "src": "https://github.com/eclipse/kuksa.val/blob/master/kuksa_databroker/proto/sdv/databroker/v1/broker.proto",
-                "required": {
-                    "methods": [
-                        "GetDatapoints",
-                        "Subscribe"
-                    ]
-                }
-            }
-        }
     ]
 }