diff --git a/README.md b/README.md
index d0e37fd2835fd370ffa6ae6d08c39e94794c3c04..06a5cfc8a7da0d416f7f0142806301baa4032b35 100644
--- a/README.md
+++ b/README.md
@@ -9,9 +9,7 @@ task deployment
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | addresses.cache | string | `"http://cache:8080"` |  |
-| addresses.didResolver | string | `"http://didresolver:8080"` |  |
 | addresses.policy | string | `"http://policy:8080"` |  |
-| addresses.task | string | `"http://task:8080"` |  |
 | autoscaling.enabled | bool | `false` | Enable autoscaling |
 | autoscaling.maxReplicas | int | `3` | Maximum replicas |
 | autoscaling.minReplicas | int | `1` | Minimum replicas |
@@ -35,8 +33,7 @@ task deployment
 | log.level | string | `"debug"` |  |
 | metrics.enabled | bool | `true` | Enable prometheus metrics |
 | metrics.port | int | `2112` | Port for prometheus metrics |
-| mongo.addr | string | `"mongodb://mongodb-mongodb-replicaset.infra:27017/policy?replicaSet=rs0&authSource=admin"` |  |
-| mongo.collection | string | `"policies"` |  |
+| mongo.addr | string | `"mongodb://mongodb-mongodb-replicaset.infra:27017/task?replicaSet=rs0&authSource=admin"` |  |
 | mongo.dbname | string | `"task"` |  |
 | mongo.pass | string | `""` |  |
 | mongo.user | string | `""` |  |
diff --git a/templates/deployment.yaml b/templates/deployment.yaml
index 778eab12e6c08138fd571b093c016e8b07de828f..7816fb377a0de8eaaf5b0a77b1590299d3cd7c96 100644
--- a/templates/deployment.yaml
+++ b/templates/deployment.yaml
@@ -61,12 +61,7 @@ spec:
           - name: CACHE_ADDR
             value: {{ .Values.addresses.cache | quote }}
           - name: POLICY_ADDR
-            value: {{ .Values.addresses.cache | quote }}
-
-          - name: TASK_ADDR
-            value: {{ .Values.addresses.task | quote }}
-          - name: DID_RESOLVER_ADDR
-            value: {{ .Values.addresses.didResolver | quote }}
+            value: {{ .Values.addresses.policy | quote }}
 {{- if .Values.extraVars }}
 {{ toYaml .Values.extraVars | indent 8 }}
 {{- end }}
diff --git a/values.yaml b/values.yaml
index 211eb2cacccca9054e32bae9b94fdbf4686eaa20..d821cfe1d347a09149b63356ec4aa1c02eae83cf 100644
--- a/values.yaml
+++ b/values.yaml
@@ -96,17 +96,14 @@ task:
       write: 10s
 
 mongo:
-  addr: "mongodb://mongodb-mongodb-replicaset.infra:27017/policy?replicaSet=rs0&authSource=admin"
+  addr: "mongodb://mongodb-mongodb-replicaset.infra:27017/task?replicaSet=rs0&authSource=admin"
   user: ""
   pass: ""
   dbname: task
-  collection: policies
 
 addresses:
-  cache: http://cache:8080
   policy: http://policy:8080
-  task: http://task:8080
-  didResolver: http://didresolver:8080
+  cache: http://cache:8080
 
 ingress:
   enabled: true