diff --git a/templates/deployment.yaml b/templates/deployment.yaml
index 4a1a5d204af72c80912f88d15d4a2baeb169bf5a..7476c9b63d5eab17a722cc7f42d60d68bbf1098f 100644
--- a/templates/deployment.yaml
+++ b/templates/deployment.yaml
@@ -41,15 +41,15 @@ spec:
           - name: LOG_ENCODING
             value: {{ .Values.log.encoding | default "json" }}
           - name: HTTP_HOST
-            value: {{ .Values.task.http.host | quote }}
+            value: {{ .Values.signer.http.host | quote }}
           - name: HTTP_PORT
-            value: {{ .Values.task.http.port | quote }}
+            value: {{ .Values.signer.http.port | quote }}
           - name: HTTP_IDLE_TIMEOUT
-            value: {{ .Values.task.http.timeout.idle | quote }}
+            value: {{ .Values.signer.http.timeout.idle | quote }}
           - name: HTTP_READ_TIMEOUT
-            value: {{ .Values.task.http.timeout.read | quote }}
+            value: {{ .Values.signer.http.timeout.read | quote }}
           - name: HTTP_WRITE_TIMEOUT
-            value: {{ .Values.task.http.timeout.write | quote }}
+            value: {{ .Values.signer.http.timeout.write | quote }}
           - name: MONGO_ADDR
             value: {{ .Values.mongo.addr | quote }}
           - name: MONGO_USER
@@ -75,11 +75,11 @@ spec:
           containerPort: {{ .Values.metrics.port }}
         {{- end }}
         - name: http
-          containerPort: {{ .Values.task.http.port }}
+          containerPort: {{ .Values.signer.http.port }}
         readinessProbe:
           httpGet:
             path: /readiness
-            port: {{ .Values.task.http.port }}
+            port: {{ .Values.signer.http.port }}
           initialDelaySeconds: 5
           periodSeconds: 5
           successThreshold: 2
diff --git a/templates/service.yaml b/templates/service.yaml
index 7a01132b230651dce081a92146b4e1339f0bffaa..980440e72d9aaa41e7ad764be14a639e0f41d102 100644
--- a/templates/service.yaml
+++ b/templates/service.yaml
@@ -10,6 +10,6 @@ spec:
   ports:
   - name: http
     targetPort: {{ .Values.service.port }}
-    port: {{ .Values.task.http.port }}
+    port: {{ .Values.signer.http.port }}
   selector:
     {{- include "app.selectorLabels" . | nindent 4 }}
diff --git a/values.yaml b/values.yaml
index 23c24d9c11c286202de47f0a1ceb1a1ba8f1b13a..ae41ddc81c853270540321af8f4de4c3c90d599a 100644
--- a/values.yaml
+++ b/values.yaml
@@ -1,14 +1,14 @@
 # -- Default number of instances to start 
 replicaCount: 1
 # -- Application name
-name: infohub
+name: signer
 # -- Ovverwrites application name
 nameOverride: ""
 
 image:
   repository: eu.gcr.io/vrgn-infra-prj
   # -- Image name
-  name: gaiax/infohub
+  name: gaiax/signer
   # -- Image tag
   # Uses .Chart.AppVersion if empty
   tag: ""
@@ -65,7 +65,7 @@ security:
 service:
   port: 8080
 
-task:
+signer:
   http:
     host: ""
     port: 8080
@@ -74,18 +74,6 @@ task:
       read: 10s
       write: 10s
 
-mongo:
-  addr: "mongodb://mongodb-mongodb-replicaset.infra:27017/infohub?replicaSet=rs0&authSource=admin&ssl=true"
-  user: ""
-  pass: ""
-  dbname: infohub
-
-addresses:
-  policy: http://policy:8080
-  cache: http://cache:8080
-  signer: http://signer:8080
-  issueruri: did:tsa:123
-
 ingress:
   enabled: true
   annotations: