diff --git a/vrf/templates/listener/deployment-listener.yaml b/vrf/templates/listener/deployment-listener.yaml
deleted file mode 100644
index f67a3572..00000000
--- a/vrf/templates/listener/deployment-listener.yaml
+++ /dev/null
@@ -1,135 +0,0 @@
-{{- if .Values.listener.enabled -}}
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ .Values.global.name }}-listener
-  labels:
-    {{- include "orakl-vrf.labels.listener" . | nindent 4 }}
-spec:
-  replicas: {{ .Values.listener.replicas }}
-  selector:
-    matchLabels:
-      {{- include "orakl-vrf.selectorLabels.listener" . | nindent 6 }}
-  template:
-    metadata:
-      {{- with .Values.global.podAnnotations }}
-      annotations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      labels:
-        {{- include "orakl-vrf.selectorLabels.listener" . | nindent 8 }}
-    spec:
-      {{- with .Values.global.image.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      serviceAccountName: {{ .Values.listener.serviceAccount.name }}
-      securityContext:
-        {{- toYaml .Values.listener.podSecurityContext | nindent 8 }}
-      containers:
-        - name: {{ .Chart.Name }}
-          securityContext:
-            {{- toYaml .Values.listener.containerSecurityContext | nindent 12 }}
-          image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.listenerTag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.global.image.pullPolicy }}
-          {{- if .Values.global.secretManager.enabled }}
-          env:
-            - name: NODE_ENV
-              valueFrom:
-                secretKeyRef:
-                  name: orakl-vrf-secrets
-                  key: NODE_ENV
-            - name: ORAKL_NETWORK_API_URL
-              valueFrom:
-                secretKeyRef:
-                  name: orakl-vrf-secrets
-                  key: ORAKL_NETWORK_API_URL
-            - name: CHAIN
-              valueFrom:
-                secretKeyRef:
-                  name: orakl-vrf-secrets
-                  key: CHAIN
-            - name: HEALTH_CHECK_PORT
-              valueFrom:
-                secretKeyRef:
-                  name: orakl-vrf-secrets
-                  key: HEALTH_CHECK_PORT
-            - name: SLACK_WEBHOOK_URL
-              valueFrom:
-                secretKeyRef:
-                  name: orakl-vrf-secrets
-                  key: SLACK_WEBHOOK_URL
-            - name: LOG_LEVEL
-              valueFrom:
-                secretKeyRef:
-                  name: orakl-vrf-secrets
-                  key: LOG_LEVEL
-            - name: REDIS_HOST
-              valueFrom:
-                secretKeyRef:
-                  name: orakl-vrf-secrets
-                  key: REDIS_HOST
-            - name: REDIS_PORT
-              valueFrom:
-                secretKeyRef:
-                  name: orakl-vrf-secrets
-                  key: REDIS_PORT
-            - name: PROVIDER_URL
-              valueFrom:
-                secretKeyRef:
-                  name: orakl-vrf-secrets
-                  key: PROVIDER_URL
-            - name: LISTENER_PORT
-              valueFrom:
-                secretKeyRef:
-                  name: orakl-vrf-secrets
-                  key: LISTENER_PORT
-          {{ else }}      
-          env:
-            {{- toYaml .Values.global.env | nindent 12 }}
-            - name: LISTENER_PORT
-              value: "4000"      
-            - name: HEALTH_CHECK_PORT
-              value: "8080"                  
-          {{ end }}
-          command: ["yarn"]
-          args: [start:listener:vrf]
-          ports:
-          - name: watchman
-            containerPort: {{ .Values.listener.APP_PORT | default 4000 | int  }}
-          - name: healthcheck
-            containerPort: 8080
-          {{- if .Values.global.livenessProbe.enabled }}
-          livenessProbe:
-            httpGet:
-              path: /
-              port: healthcheck
-            initialDelaySeconds: {{ .Values.global.livenessProbe.initialDelaySeconds }}
-            periodSeconds: {{ .Values.global.livenessProbe.periodSeconds }}
-            timeoutSeconds: {{ .Values.global.livenessProbe.timeoutSeconds }}
-            successThreshold: {{ .Values.global.livenessProbe.successThreshold }}
-            failureThreshold: {{ .Values.global.livenessProbe.failureThreshold }}
-          {{- end }}
-          {{- if .Values.global.readinessProbe.enabled }}
-          readinessProbe:
-            httpGet:
-              path: /
-              port: healthcheck
-            initialDelaySeconds: {{ .Values.global.readinessProbe.initialDelaySeconds }}
-            periodSeconds: {{ .Values.global.readinessProbe.periodSeconds }}
-            timeoutSeconds: {{ .Values.global.readinessProbe.timeoutSeconds }}
-            successThreshold: {{ .Values.global.readinessProbe.successThreshold }}
-            failureThreshold: {{ .Values.global.readinessProbe.failureThreshold }}
-          {{- end }}
-          resources:
-            {{- toYaml .Values.listener.resources | nindent 12 }}
-
-      {{- with .Values.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-{{- end }}
\ No newline at end of file
diff --git a/vrf/templates/listener/sa.yaml b/vrf/templates/listener/sa.yaml
deleted file mode 100644
index 0640a489..00000000
--- a/vrf/templates/listener/sa.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-{{- if .Values.listener.serviceAccount.create -}}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ .Values.listener.serviceAccount.name }}
-  labels:
-    {{- include "orakl-vrf.labels.listener" . | nindent 4 }}
-  {{- with .Values.listener.serviceAccount.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-{{- end }}
diff --git a/vrf/templates/listener/service.yaml b/vrf/templates/listener/service.yaml
deleted file mode 100644
index 3dc7400d..00000000
--- a/vrf/templates/listener/service.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ .Values.global.name }}-listener
-  labels: 
-    {{- include "orakl-vrf.labels.listener" . | nindent 4 }}  
-spec:
-  type: ClusterIP
-  ports:
-  - name: watchman
-    port: 4000
-    targetPort: 4000
-    protocol: TCP
-  - name: healthcheck
-    port: 8080
-    targetPort: 8080
-    protocol: TCP    
-  selector:
-    {{- include "orakl-vrf.selectorLabels.listener" . | nindent 6 }}
diff --git a/vrf/templates/reporter/deployment-reporter.yaml b/vrf/templates/reporter/deployment-reporter.yaml
deleted file mode 100644
index 117684fd..00000000
--- a/vrf/templates/reporter/deployment-reporter.yaml
+++ /dev/null
@@ -1,147 +0,0 @@
-{{- if .Values.reporter.enabled -}}
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ .Values.global.name }}-reporter
-  labels:
-    {{- include "orakl-vrf.labels.reporter" . | nindent 4 }}
-spec:
-  replicas: {{ .Values.reporter.replicas }}
-  selector:
-    matchLabels:
-      {{- include "orakl-vrf.selectorLabels.reporter" . | nindent 6 }}
-  template:
-    metadata:
-      {{- with .Values.global.podAnnotations }}
-      annotations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      labels:
-        {{- include "orakl-vrf.selectorLabels.reporter" . | nindent 8 }}
-    spec:
-      {{- with .Values.global.image.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      serviceAccountName: {{ .Values.reporter.serviceAccount.name }}
-      securityContext:
-        {{- toYaml .Values.reporter.podSecurityContext | nindent 8 }}
-      {{- if .Values.global.affinity.enabled }}
-      affinity:
-        nodeAffinity:
-          preferredDuringSchedulingIgnoredDuringExecution:
-          - weight: 1
-            preference:
-              matchExpressions:
-              - key: {{ .Values.global.affinity.key }}
-                operator: In
-                values:
-                - {{ .Values.global.affinity.value }}
-      {{- end }}
-      containers:
-        - name: {{ .Chart.Name }}
-          securityContext:
-            {{- toYaml .Values.reporter.containerSecurityContext | nindent 12 }}
-          image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.reporterTag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.global.image.pullPolicy }}
-           {{- if .Values.global.secretManager.enabled }}
-          env:
-            - name: NODE_ENV
-              valueFrom:
-                secretKeyRef:
-                  name: orakl-vrf-secrets
-                  key: NODE_ENV
-            - name: ORAKL_NETWORK_API_URL
-              valueFrom:
-                secretKeyRef:
-                  name: orakl-vrf-secrets
-                  key: ORAKL_NETWORK_API_URL
-            - name: CHAIN
-              valueFrom:
-                secretKeyRef:
-                  name: orakl-vrf-secrets
-                  key: CHAIN
-            - name: HEALTH_CHECK_PORT
-              valueFrom:
-                secretKeyRef:
-                  name: orakl-vrf-secrets
-                  key: HEALTH_CHECK_PORT
-            - name: SLACK_WEBHOOK_URL
-              valueFrom:
-                secretKeyRef:
-                  name: orakl-vrf-secrets
-                  key: SLACK_WEBHOOK_URL
-            - name: LOG_LEVEL
-              valueFrom:
-                secretKeyRef:
-                  name: orakl-vrf-secrets
-                  key: LOG_LEVEL
-            - name: REDIS_HOST
-              valueFrom:
-                secretKeyRef:
-                  name: orakl-vrf-secrets
-                  key: REDIS_HOST
-            - name: REDIS_PORT
-              valueFrom:
-                secretKeyRef:
-                  name: orakl-vrf-secrets
-                  key: REDIS_PORT
-            - name: PROVIDER_URL
-              valueFrom:
-                secretKeyRef:
-                  name: orakl-vrf-secrets
-                  key: PROVIDER_URL
-            - name: REPORTER_PORT
-              valueFrom:
-                secretKeyRef:
-                  name: orakl-vrf-secrets
-                  key: REPORTER_PORT
-          {{ else }}      
-          env:
-            {{- toYaml .Values.global.env | nindent 12 }}
-            - name: REPORTER_PORT
-              value: "6000"      
-            - name: HEALTH_CHECK_PORT
-              value: "8080"     
-          {{ end }}
-          command: ["yarn"]
-          args: [start:reporter:vrf]
-          ports:
-          - name: watchman
-            containerPort: {{ .Values.reporter.APP_PORT | default 6000 | int  }}
-          - name: healthcheck
-            containerPort: 8080
-          {{- if .Values.global.livenessProbe.enabled }}
-          livenessProbe:
-            httpGet:
-              path: /
-              port: healthcheck
-            initialDelaySeconds: {{ .Values.global.livenessProbe.initialDelaySeconds }}
-            periodSeconds: {{ .Values.global.livenessProbe.periodSeconds }}
-            timeoutSeconds: {{ .Values.global.livenessProbe.timeoutSeconds }}
-            successThreshold: {{ .Values.global.livenessProbe.successThreshold }}
-            failureThreshold: {{ .Values.global.livenessProbe.failureThreshold }}
-          {{- end }}
-          {{- if .Values.global.readinessProbe.enabled }}
-          readinessProbe:
-            httpGet:
-              path: /
-              port: healthcheck
-            initialDelaySeconds: {{ .Values.global.readinessProbe.initialDelaySeconds }}
-            periodSeconds: {{ .Values.global.readinessProbe.periodSeconds }}
-            timeoutSeconds: {{ .Values.global.readinessProbe.timeoutSeconds }}
-            successThreshold: {{ .Values.global.readinessProbe.successThreshold }}
-            failureThreshold: {{ .Values.global.readinessProbe.failureThreshold }}
-          {{- end }}
-          resources:
-            {{- toYaml .Values.reporter.resources | nindent 12 }}
-
-      {{- with .Values.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-{{- end }}
\ No newline at end of file
diff --git a/vrf/templates/reporter/sa.yaml b/vrf/templates/reporter/sa.yaml
deleted file mode 100644
index ba517666..00000000
--- a/vrf/templates/reporter/sa.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-{{- if .Values.reporter.serviceAccount.create -}}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ .Values.reporter.serviceAccount.name }}
-  labels:
-    {{- include "orakl-vrf.labels.reporter" . | nindent 4 }}
-  {{- with .Values.reporter.serviceAccount.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-{{- end }}
diff --git a/vrf/templates/reporter/service.yaml b/vrf/templates/reporter/service.yaml
deleted file mode 100644
index 8826ccd1..00000000
--- a/vrf/templates/reporter/service.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ .Values.global.name }}-reporter
-  labels: 
-    {{- include "orakl-vrf.labels.reporter" . | nindent 4 }}  
-spec:
-  type: ClusterIP
-  ports:
-  - name: watchman
-    port: 6000
-    targetPort: 6000
-    protocol: TCP
-  - name: healthcheck
-    port: 8080
-    targetPort: 8080
-  selector:
-    {{- include "orakl-vrf.selectorLabels.reporter" . | nindent 6 }}
diff --git a/vrf/templates/worker/deployment-worker.yaml b/vrf/templates/worker/deployment-worker.yaml
deleted file mode 100644
index 6292b719..00000000
--- a/vrf/templates/worker/deployment-worker.yaml
+++ /dev/null
@@ -1,148 +0,0 @@
-{{- if .Values.worker.enabled -}}
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ .Values.global.name }}-worker
-  labels:
-    {{- include "orakl-vrf.labels.worker" . | nindent 4 }}
-spec:
-  replicas: {{ .Values.worker.replicas }}
-  selector:
-    matchLabels:
-      {{- include "orakl-vrf.selectorLabels.worker" . | nindent 6 }}
-  template:
-    metadata:
-      {{- with .Values.global.podAnnotations }}
-      annotations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      labels:
-        {{- include "orakl-vrf.selectorLabels.worker" . | nindent 8 }}
-    spec:
-      {{- with .Values.global.image.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      serviceAccountName: {{ .Values.worker.serviceAccount.name }}
-      securityContext:
-        {{- toYaml .Values.worker.podSecurityContext | nindent 8 }}
-      {{- if .Values.global.affinity.enabled }}
-      affinity:
-        nodeAffinity:
-          preferredDuringSchedulingIgnoredDuringExecution:
-          - weight: 1
-            preference:
-              matchExpressions:
-              - key: {{ .Values.global.affinity.key }}
-                operator: In
-                values:
-                - {{ .Values.global.affinity.value }}
-      {{- end }}
-      containers:
-        - name: {{ .Chart.Name }}
-          securityContext:
-            {{- toYaml .Values.worker.containerSecurityContext | nindent 12 }}
-          image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.workerTag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.global.image.pullPolicy }}
-          {{- if .Values.global.secretManager.enabled }}
-          env:
-            - name: NODE_ENV
-              valueFrom:
-                secretKeyRef:
-                  name: orakl-vrf-secrets
-                  key: NODE_ENV
-            - name: ORAKL_NETWORK_API_URL
-              valueFrom:
-                secretKeyRef:
-                  name: orakl-vrf-secrets
-                  key: ORAKL_NETWORK_API_URL
-            - name: CHAIN
-              valueFrom:
-                secretKeyRef:
-                  name: orakl-vrf-secrets
-                  key: CHAIN
-            - name: HEALTH_CHECK_PORT
-              valueFrom:
-                secretKeyRef:
-                  name: orakl-vrf-secrets
-                  key: HEALTH_CHECK_PORT
-            - name: SLACK_WEBHOOK_URL
-              valueFrom:
-                secretKeyRef:
-                  name: orakl-vrf-secrets
-                  key: SLACK_WEBHOOK_URL
-            - name: LOG_LEVEL
-              valueFrom:
-                secretKeyRef:
-                  name: orakl-vrf-secrets
-                  key: LOG_LEVEL
-            - name: REDIS_HOST
-              valueFrom:
-                secretKeyRef:
-                  name: orakl-vrf-secrets
-                  key: REDIS_HOST
-            - name: REDIS_PORT
-              valueFrom:
-                secretKeyRef:
-                  name: orakl-vrf-secrets
-                  key: REDIS_PORT
-            - name: PROVIDER_URL
-              valueFrom:
-                secretKeyRef:
-                  name: orakl-vrf-secrets
-                  key: PROVIDER_URL
-            - name: WORKER_PORT
-              valueFrom:
-                secretKeyRef:
-                  name: orakl-vrf-secrets
-                  key: WORKER_PORT
-          {{ else }}
-          env:
-            {{- toYaml .Values.global.env | nindent 12 }}
-            - name: worker_port
-              value: "5000"      
-            - name: HEALTH_CHECK_PORT
-              value: "8080"       
-          {{ end }}
-          command: ["yarn"]
-          args: [start:worker:vrf]
-          ports:
-          - name: watchman
-            containerPort: {{ .Values.worker.APP_PORT | default 5000 | int  }}
-          - name: healthcheck
-            containerPort: 8080
-
-          {{- if .Values.global.livenessProbe.enabled }}
-          livenessProbe:
-            httpGet:
-              path: /
-              port: healthcheck
-            initialDelaySeconds: {{ .Values.global.livenessProbe.initialDelaySeconds }}
-            periodSeconds: {{ .Values.global.livenessProbe.periodSeconds }}
-            timeoutSeconds: {{ .Values.global.livenessProbe.timeoutSeconds }}
-            successThreshold: {{ .Values.global.livenessProbe.successThreshold }}
-            failureThreshold: {{ .Values.global.livenessProbe.failureThreshold }}
-          {{- end }}
-          {{- if .Values.global.readinessProbe.enabled }}
-          readinessProbe:
-            httpGet:
-              path: /
-              port: healthcheck
-            initialDelaySeconds: {{ .Values.global.readinessProbe.initialDelaySeconds }}
-            periodSeconds: {{ .Values.global.readinessProbe.periodSeconds }}
-            timeoutSeconds: {{ .Values.global.readinessProbe.timeoutSeconds }}
-            successThreshold: {{ .Values.global.readinessProbe.successThreshold }}
-            failureThreshold: {{ .Values.global.readinessProbe.failureThreshold }}
-          {{- end }}
-          resources:
-            {{- toYaml .Values.worker.resources | nindent 12 }}
-
-      {{- with .Values.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-{{- end }}
\ No newline at end of file
diff --git a/vrf/templates/worker/sa.yaml b/vrf/templates/worker/sa.yaml
deleted file mode 100644
index 3625e61e..00000000
--- a/vrf/templates/worker/sa.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-{{- if .Values.worker.serviceAccount.create -}}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ .Values.worker.serviceAccount.name }}
-  labels:
-    {{- include "orakl-vrf.labels.worker" . | nindent 4 }}
-  {{- with .Values.worker.serviceAccount.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-{{- end }}
diff --git a/vrf/templates/worker/service.yaml b/vrf/templates/worker/service.yaml
deleted file mode 100644
index dbec6d7e..00000000
--- a/vrf/templates/worker/service.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ .Values.global.name }}-worker
-  labels: 
-    {{- include "orakl-vrf.labels.worker" . | nindent 4 }}  
-spec:
-  type: ClusterIP
-  ports:
-  - name: watchman
-    port: 5000
-    targetPort: 5000
-    protocol: TCP
-  - name: healthcheck
-    port: 8080
-    targetPort: 8080
-  selector:
-    {{- include "orakl-vrf.selectorLabels.worker" . | nindent 6 }}
diff --git a/vrf/values.baobab.yaml b/vrf/values.baobab.yaml
index 6606e675..9d4d26cb 100644
--- a/vrf/values.baobab.yaml
+++ b/vrf/values.baobab.yaml
@@ -65,87 +65,6 @@ global:
     successThreshold: 1
     failureThreshold: 5
 
-listener:
-  enabled: true
-  replicas: 1
-  serviceAccount:
-    # -- Create a service account for the application controller
-    create: true
-    # -- Service account name
-    name: orakl-vrf-listener
-    # -- Annotations applied to created service account
-    annotations: {}
-    # -- Automount API credentials for the Service Account
-    automountServiceAccountToken: true
-
-  APP_PORT: 4000
-
-  podSecurityContext: {}
-
-  containerSecurityContext: {}
-
-  resources:
-    limits:
-      cpu: 1000m
-      memory: 1Gi
-    requests:
-      cpu: 1000m
-      memory: 1Gi
-
-worker:
-  enabled: true
-  replicas: 1
-  serviceAccount:
-    # -- Create a service account for the application controller
-    create: true
-    # -- Service account name
-    name: orakl-vrf-worker
-    # -- Annotations applied to created service account
-    annotations: {}
-    # -- Automount API credentials for the Service Account
-    automountServiceAccountToken: true
-
-  APP_PORT: 5000
-
-  podSecurityContext: {}
-
-  containerSecurityContext: {}
-
-  resources:
-    limits:
-      cpu: 1000m
-      memory: 1Gi
-    requests:
-      cpu: 1000m
-      memory: 1Gi
-
-reporter:
-  enabled: true
-  replicas: 1
-  serviceAccount:
-    # -- Create a service account for the application controller
-    create: true
-    # -- Service account name
-    name: orakl-vrf-reporter
-    # -- Annotations applied to created service account
-    annotations: {}
-    # -- Automount API credentials for the Service Account
-    automountServiceAccountToken: true
-
-  APP_PORT: 6000
-
-  podSecurityContext: {}
-
-  containerSecurityContext: {}
-
-  resources:
-    limits:
-      cpu: 500m
-      memory: 1Gi
-    requests:
-      cpu: 500m
-      memory: 1Gi
-
 core:
   enabled: true
   replicas: 1
diff --git a/vrf/values.cypress.yaml b/vrf/values.cypress.yaml
index 9e5ba3d7..c9aa4dcc 100644
--- a/vrf/values.cypress.yaml
+++ b/vrf/values.cypress.yaml
@@ -65,87 +65,6 @@ global:
     successThreshold: 1
     failureThreshold: 5
 
-listener:
-  enabled: true
-  replicas: 1
-  serviceAccount:
-    # -- Create a service account for the application controller
-    create: true
-    # -- Service account name
-    name: orakl-vrf-listener
-    # -- Annotations applied to created service account
-    annotations: {}
-    # -- Automount API credentials for the Service Account
-    automountServiceAccountToken: true
-
-  APP_PORT: 4000
-
-  podSecurityContext: {}
-
-  containerSecurityContext: {}
-
-  resources:
-    limits:
-      cpu: 1000m
-      memory: 1Gi
-    requests:
-      cpu: 1000m
-      memory: 1Gi
-
-worker:
-  enabled: true
-  replicas: 1
-  serviceAccount:
-    # -- Create a service account for the application controller
-    create: true
-    # -- Service account name
-    name: orakl-vrf-worker
-    # -- Annotations applied to created service account
-    annotations: {}
-    # -- Automount API credentials for the Service Account
-    automountServiceAccountToken: true
-
-  APP_PORT: 5000
-
-  podSecurityContext: {}
-
-  containerSecurityContext: {}
-
-  resources:
-    limits:
-      cpu: 1000m
-      memory: 1Gi
-    requests:
-      cpu: 1000m
-      memory: 1Gi
-
-reporter:
-  enabled: true
-  replicas: 1
-  serviceAccount:
-    # -- Create a service account for the application controller
-    create: true
-    # -- Service account name
-    name: orakl-vrf-reporter
-    # -- Annotations applied to created service account
-    annotations: {}
-    # -- Automount API credentials for the Service Account
-    automountServiceAccountToken: true
-
-  APP_PORT: 6000
-
-  podSecurityContext: {}
-
-  containerSecurityContext: {}
-
-  resources:
-    limits:
-      cpu: 500m
-      memory: 1Gi
-    requests:
-      cpu: 500m
-      memory: 1Gi
-
 core:
   enabled: true
   replicas: 1
diff --git a/vrf/values.yaml b/vrf/values.yaml
index f839ce86..05b1fdce 100644
--- a/vrf/values.yaml
+++ b/vrf/values.yaml
@@ -53,87 +53,6 @@ global:
     successThreshold: 1
     failureThreshold: 5
 
-listener:
-  enabled: true
-  replicas: 1
-  serviceAccount:
-    # -- Create a service account for the application controller
-    create: true
-    # -- Service account name
-    name: orakl-vrf-listener
-    # -- Annotations applied to created service account
-    annotations: {}
-    # -- Automount API credentials for the Service Account
-    automountServiceAccountToken: true
-
-  APP_PORT: 4000
-
-  podSecurityContext: {}
-
-  containerSecurityContext: {}
-
-  resources:
-    limits:
-      cpu: 500m
-      memory: 800mi
-    requests:
-      cpu: 500m
-      memory: 800mi
-
-worker:
-  enabled: true
-  replicas: 1
-  serviceAccount:
-    # -- Create a service account for the application controller
-    create: true
-    # -- Service account name
-    name: orakl-vrf-worker
-    # -- Annotations applied to created service account
-    annotations: {}
-    # -- Automount API credentials for the Service Account
-    automountServiceAccountToken: true
-
-  APP_PORT: 5000
-
-  podSecurityContext: {}
-
-  containerSecurityContext: {}
-
-  resources:
-    limits:
-      cpu: 500m
-      memory: 800mi
-    requests:
-      cpu: 500m
-      memory: 800mi
-
-reporter:
-  enabled: true
-  replicas: 1
-  serviceAccount:
-    # -- Create a service account for the application controller
-    create: true
-    # -- Service account name
-    name: orakl-vrf-reporter
-    # -- Annotations applied to created service account
-    annotations: {}
-    # -- Automount API credentials for the Service Account
-    automountServiceAccountToken: true
-
-  APP_PORT: 6000
-
-  podSecurityContext: {}
-
-  containerSecurityContext: {}
-
-  resources:
-    limits:
-      cpu: 500m
-      memory: 800mi
-    requests:
-      cpu: 500m
-      memory: 800mi
-
 core:
   enabled: true
   replicas: 1