diff --git a/charts/rollups-node/templates/NOTES.txt b/charts/rollups-node/templates/NOTES.txt
index 100fdba..7302ebb 100644
--- a/charts/rollups-node/templates/NOTES.txt
+++ b/charts/rollups-node/templates/NOTES.txt
@@ -1,16 +1,16 @@
 1. Get the application URL by running these commands:
-{{- if contains "NodePort" .Values.graphqlServer.service.type }}
+{{- if contains "NodePort" .Values.validator.service.type }}
   export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "validator.fullname" . }})
   export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
   echo http://$NODE_IP:$NODE_PORT
-{{- else if contains "LoadBalancer" .Values.graphqlServer.service.type }}
+{{- else if contains "LoadBalancer" .Values.validator.service.type }}
      NOTE: It may take a few minutes for the LoadBalancer IP to be available.
            You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "validator.fullname" . }}'
   export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "validator.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
-  echo http://$SERVICE_IP:{{ .Values.graphqlServer.service.port }}
-{{- else if contains "ClusterIP" .Values.graphqlServer.service.type }}
+  echo http://$SERVICE_IP:4000/graphql
+{{- else if contains "ClusterIP" .Values.validator.service.type }}
   export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "validator.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
   export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
-  echo "Visit http://127.0.0.1:8080/graphql to use your application"
+  echo "Visit http://127.0.0.1:4000/graphql to use your application"
   kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT
 {{- end }}
diff --git a/charts/rollups-node/templates/_helpers.tpl b/charts/rollups-node/templates/_helpers.tpl
index 6b9fe10..3933ee1 100644
--- a/charts/rollups-node/templates/_helpers.tpl
+++ b/charts/rollups-node/templates/_helpers.tpl
@@ -90,52 +90,10 @@ Return the proper image name
 {{- end -}}
 
 {{/*
-Return the proper dispatcher image name
+Return the proper validator image name
 */}}
-{{- define "dispatcher.image" -}}
-{{ include "images.image" (dict "imageRoot" .Values.dispatcher.image "global" .Values.global) }}
-{{- end -}}
-
-{{/*
-Return the proper authorityClaimer image name
-*/}}
-{{- define "authorityClaimer.image" -}}
-{{ include "images.image" (dict "imageRoot" .Values.authorityClaimer.image "global" .Values.global) }}
-{{- end -}}
-
-{{/*
-Return the proper stateServer image name
-*/}}
-{{- define "stateServer.image" -}}
-{{ include "images.image" (dict "imageRoot" .Values.stateServer.image "global" .Values.global) }}
-{{- end -}}
-
-{{/*
-Return the proper indexer image name
-*/}}
-{{- define "indexer.image" -}}
-{{ include "images.image" (dict "imageRoot" .Values.indexer.image "global" .Values.global ) }}
-{{- end -}}
-
-{{/*
-Return the proper graphqlServer image name
-*/}}
-{{- define "graphqlServer.image" -}}
-{{ include "images.image" (dict "imageRoot" .Values.graphqlServer.image "global" .Values.global ) }}
-{{- end -}}
-
-{{/*
-Return the proper inspectServer image name
-*/}}
-{{- define "inspectServer.image" -}}
-{{ include "images.image" (dict "imageRoot" .Values.inspectServer.image "global" .Values.global ) }}
-{{- end -}}
-
-{{/*
-Return the proper serverManager.advanceRunner image name
-*/}}
-{{- define "serverManager.advanceRunner.image" -}}
-{{ include "images.image" (dict "imageRoot" .Values.serverManager.advanceRunner.image "global" .Values.global ) }}
+{{- define "validator.image" -}}
+{{ include "images.image" (dict "imageRoot" .Values.validator.image "global" .Values.global) }}
 {{- end -}}
 
 {{/*
diff --git a/charts/rollups-node/templates/authority-claimer-deployment.yaml b/charts/rollups-node/templates/authority-claimer-deployment.yaml
deleted file mode 100644
index 5d64308..0000000
--- a/charts/rollups-node/templates/authority-claimer-deployment.yaml
+++ /dev/null
@@ -1,131 +0,0 @@
-{{- /*
-(c) Cartesi and individual authors (see AUTHORS)
-SPDX-License-Identifier: Apache-2.0 (see LICENSE)
-*/}}
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "validator.fullname" . }}-authority-claimer
-  labels: {{- include "validator.labels" . | nindent 4 }}
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      {{- include "validator.selectorLabels" . | nindent 6 }}
-      rollups.cartesi.io/component: authority-claimer
-  template:
-    metadata:
-      {{- with .Values.authorityClaimer.podAnnotations }}
-      annotations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      labels:
-        {{- include "validator.selectorLabels" . | nindent 8 }}
-        rollups.cartesi.io/component: authority-claimer
-    spec:
-      {{- with .Values.image.pullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      serviceAccountName: {{ include "validator.serviceAccountName" . }}
-      securityContext:
-        {{- toYaml .Values.authorityClaimer.podSecurityContext | nindent 8 }}
-      initContainers:
-        {{- if .Values.authorityClaimer.initContainers }}
-        {{- include "tplvalues.render" ( dict "value" .Values.authorityClaimer.initContainers "context" $ ) | nindent 8 }}
-        {{- end }}
-      containers:
-        - name: rollups-authority-claimer
-          image: {{ include "authorityClaimer.image" . }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          resources:
-            {{- toYaml .Values.authorityClaimer.resources | nindent 12 }}
-          {{- if .Values.authorityClaimer.command }}
-          command:
-          {{- include "tplvalues.render" (dict "value" .Values.authorityClaimer.command "context" $) | nindent 12 }}
-          {{- end }}
-          args:
-            {{- if .Values.authorityClaimer.healthCheck.enabled }}
-            - {{ print "--http-server-port=" (default .Values.authorityClaimer.healthCheck.port 8086) | quote }}
-            {{- end }}
-            - {{ print "--dapp-address=" (required "A valid .Values.dapp.contractAddress is required" .Values.dapp.contractAddress) | quote }}
-            - {{ print "--dapp-deploy-block-hash=" (required "A valid .Values.dapp.blockHash is required" .Values.dapp.blockHash) | quote }}
-            {{- if (or .Values.dapp.mnemonic.value .Values.dapp.mnemonic.secretRef) }}
-            - {{ print "--tx-signing-mnemonic-file=/var/run/secrets/mnemonic/MNEMONIC" | quote }}
-            {{- end }}
-            - {{ print "--tx-provider-http-endpoint=" (required "A valid .Values.dapp.httpProvider is required" .Values.dapp.httpProvider) | quote }}
-            {{- if (or .Values.dapp.network) }}
-            - {{ print "--tx-chain-id=" (include "dapp.chainID" .) | quote }}
-            {{- end }}
-            {{- range .Values.authorityClaimer.args }}
-            - {{ . | quote}}
-            {{- end }}
-            {{- range .Values.authorityClaimer.extraArgs }}
-            - {{ . | quote}}
-            {{- end }}
-          {{- if .Values.authorityClaimer.healthCheck.enabled }}
-          livenessProbe:
-            httpGet:
-              path: /healthz
-              port: {{ (default 8086 .Values.authorityClaimer.healthCheck.port) }}
-            initialDelaySeconds: 3
-          {{- end }}
-          env:
-            - name: RUST_LOG
-              value: {{ .Values.authorityClaimer.logLevel }}
-            {{- if .Values.authorityClaimer.extraEnvVars }}
-            {{- include "tplvalues.render" (dict "value" .Values.authorityClaimer.extraEnvVars "context" $) | nindent 12 }}
-            {{- end }}
-          {{- if or .Values.authorityClaimer.extraEnvVarsCM .Values.authorityClaimer.extraEnvVarsSecret }}
-          envFrom:
-            {{- if .Values.authorityClaimer.extraEnvVarsCM }}
-            - configMapRef:
-                name: {{ include "tplvalues.render" ( dict "value" .Values.authorityClaimer.extraEnvVarsCM "context" $ ) }}
-            {{- end }}
-            {{- if .Values.authorityClaimer.extraEnvVarsSecret }}
-            - secretRef:
-                name: {{ include "tplvalues.render" ( dict "value" .Values.authorityClaimer.extraEnvVarsSecret "context" $ ) }}
-            {{- end }}
-          {{- end }}
-          volumeMounts:
-            {{- if (or .Values.dapp.mnemonic.value .Values.dapp.mnemonic.secretRef) }}
-            - name: mnemonic
-              mountPath: /var/run/secrets/mnemonic
-              readOnly: true
-            {{- end }}
-            - name: authority-claimer-lib
-              mountPath: /opt/cartesi/rollups-authority-claimer/lib
-              readOnly: false
-            {{- if .Values.authorityClaimer.extraVolumeMounts }}
-            {{- include "tplvalues.render" ( dict "value" .Values.authorityClaimer.extraVolumeMounts "context" $ ) | nindent 12 }}
-            {{- end }}
-
-      volumes:
-        - name: authority-claimer-lib
-          emptyDir: {}
-        {{- if (or .Values.dapp.mnemonic.value .Values.dapp.mnemonic.secretRef) }}
-        - name: mnemonic
-          secret:
-            {{- if .Values.dapp.mnemonic.value }}
-            secretName: {{ include "validator.fullname" . }}-mnemonic
-            {{- else }}
-            secretName: {{ .Values.dapp.mnemonic.secretRef }}
-            {{- end }}
-        {{- end }}
-        {{- if .Values.authorityClaimer.extraVolumes }}
-        {{- include "tplvalues.render" ( dict "value" .Values.authorityClaimer.extraVolumes "context" $ ) | nindent 8 }}
-        {{- end }}
-      {{- with .Values.authorityClaimer.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.authorityClaimer.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.authorityClaimer.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
diff --git a/charts/rollups-node/templates/deployment.yaml b/charts/rollups-node/templates/deployment.yaml
new file mode 100644
index 0000000..680d46f
--- /dev/null
+++ b/charts/rollups-node/templates/deployment.yaml
@@ -0,0 +1,131 @@
+{{- /*
+(c) Cartesi and individual authors (see AUTHORS)
+SPDX-License-Identifier: Apache-2.0 (see LICENSE)
+*/}}
+
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "validator.fullname" . }}-validator
+  labels: {{- include "validator.labels" . | nindent 4 }}
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      {{- include "validator.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      {{- with .Values.validator.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      labels:
+        {{- include "validator.selectorLabels" . | nindent 8 }}
+    spec:
+      {{- with .Values.image.pullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      serviceAccountName: {{ include "validator.serviceAccountName" . }}
+      securityContext:
+        {{- toYaml .Values.validator.podSecurityContext | nindent 8 }}
+      initContainers:
+        {{- if .Values.validator.initContainers }}
+        {{- include "tplvalues.render" ( dict "value" .Values.validator.initContainers "context" $ ) | nindent 8 }}
+        {{- end }}
+      containers:
+        - name: rollups-node
+          image: {{ include "validator.image" . }}
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          resources:
+            {{- toYaml .Values.validator.resources | nindent 12 }}
+          {{- if .Values.validator.command }}
+          command:
+          {{- include "tplvalues.render" (dict "value" .Values.validator.command "context" $) | nindent 12 }}
+          {{- end }}
+          {{- if .Values.validator.args }}
+          args:
+          {{- include "tplvalues.render" (dict "value" .Values.validator.args "context" $) | nindent 12 }}
+            {{- range .Values.validator.extraArgs }}
+            - {{ . | quote}}
+            {{- end }}
+          {{- end }}
+          {{- if .Values.validator.healthCheck.enabled }}
+          livenessProbe:
+            httpGet:
+              path: /healthz
+              port: {{ (default 8081 .Values.validator.healthCheck.port) }}
+            initialDelaySeconds: 3
+          {{- end }}
+          env:
+            - name: CARTESI_LOG_LEVEL
+              value: {{ .Values.validator.logLevel }}
+            {{- if .Values.dapp.network }}
+            - name: CARTESI_BLOCKCHAIN_ID
+              value: {{ print "--chain-id=" (include "dapp.chainID" .) | quote }}
+            {{- end }}
+            {{- if .Values.dapp.contractAddress }}
+            - name: CARTESI_CONTRACTS_DAPP_ADDRESS
+              value: {{ .Values.dapp.contractAddress | quote }}
+            {{- end }}
+            {{- if .Values.dapp.blockNumber }}
+            - name: CARTESI_CONTRACTS_DAPP_DEPLOYMENT_BLOCK_NUMBER
+              value: {{ .Values.dapp.blockNumber | quote }}
+            {{- end }}
+            {{- if .Values.dapp.httpProvider }}
+            - name: CARTESI_BLOCKCHAIN_HTTP_ENDPOINT
+              value: {{ .Values.dapp.httpProvider | quote }}
+            {{- end }}
+            {{- if .Values.dapp.wsProvider }}
+            - name: CARTESI_BLOCKCHAIN_WS_ENDPOINT
+              value: {{ .Values.dapp.wsProvider | quote }}
+            {{- end }}
+            {{- if .Values.validator.extraEnvVars }}
+            {{- include "tplvalues.render" (dict "value" .Values.validator.extraEnvVars "context" $) | nindent 12 }}
+            {{- end }}
+          {{- if or .Values.validator.extraEnvVarsCM .Values.validator.extraEnvVarsSecret }}
+          envFrom:
+            {{- if .Values.validator.extraEnvVarsCM }}
+            - configMapRef:
+                name: {{ include "tplvalues.render" ( dict "value" .Values.validator.extraEnvVarsCM "context" $ ) }}
+            {{- end }}
+            {{- if .Values.validator.extraEnvVarsSecret }}
+            - secretRef:
+                name: {{ include "tplvalues.render" ( dict "value" .Values.validator.extraEnvVarsSecret "context" $ ) }}
+            {{- end }}
+          {{- end }}
+          volumeMounts:
+            {{- if (or .Values.dapp.mnemonic.value .Values.dapp.mnemonic.secretRef) }}
+            - name: mnemonic
+              mountPath: /var/run/secrets/mnemonic
+              readOnly: true
+            {{- end }}
+            {{- if .Values.validator.extraVolumeMounts }}
+            {{- include "tplvalues.render" ( dict "value" .Values.validator.extraVolumeMounts "context" $ ) | nindent 12 }}
+            {{- end }}
+      volumes:
+        {{- if (or .Values.dapp.mnemonic.value .Values.dapp.mnemonic.secretRef) }}
+        - name: mnemonic
+          secret:
+            {{- if .Values.dapp.mnemonic.value }}
+            secretName: {{ include "validator.fullname" . }}-mnemonic
+            {{- else }}
+            secretName: {{ .Values.dapp.mnemonic.secretRef }}
+            {{- end }}
+        {{- end }}
+        {{- if .Values.validator.extraVolumes }}
+        {{- include "tplvalues.render" ( dict "value" .Values.validator.extraVolumes "context" $ ) | nindent 8 }}
+        {{- end }}
+      {{- with .Values.validator.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.validator.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.validator.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
diff --git a/charts/rollups-node/templates/dispatcher-deployment.yaml b/charts/rollups-node/templates/dispatcher-deployment.yaml
deleted file mode 100644
index 4083e54..0000000
--- a/charts/rollups-node/templates/dispatcher-deployment.yaml
+++ /dev/null
@@ -1,122 +0,0 @@
-{{- /*
-(c) Cartesi and individual authors (see AUTHORS)
-SPDX-License-Identifier: Apache-2.0 (see LICENSE)
-*/}}
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "validator.fullname" . }}-dispatcher
-  labels: {{- include "validator.labels" . | nindent 4 }}
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      {{- include "validator.selectorLabels" . | nindent 6 }}
-      rollups.cartesi.io/component: dispatcher
-  template:
-    metadata:
-      {{- with .Values.dispatcher.podAnnotations }}
-      annotations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      labels:
-        {{- include "validator.selectorLabels" . | nindent 8 }}
-        rollups.cartesi.io/component: dispatcher
-    spec:
-      {{- with .Values.image.pullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      serviceAccountName: {{ include "validator.serviceAccountName" . }}
-      securityContext:
-        {{- toYaml .Values.dispatcher.podSecurityContext | nindent 8 }}
-      initContainers:
-        {{- if .Values.dispatcher.initContainers }}
-        {{- include "tplvalues.render" ( dict "value" .Values.dispatcher.initContainers "context" $ ) | nindent 8 }}
-        {{- end }}
-      containers:
-        - name: rollups-dispatcher
-          image: {{ include "dispatcher.image" . }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          resources:
-            {{- toYaml .Values.dispatcher.resources | nindent 12 }}
-          {{- if .Values.dispatcher.command }}
-          command:
-          {{- include "tplvalues.render" (dict "value" .Values.dispatcher.command "context" $) | nindent 12 }}
-          {{- end }}
-          args:
-            - {{ print "--sc-grpc-endpoint=http://" (include "validator.fullname" .) "-state-server:50051" | quote }}
-            {{- if .Values.dispatcher.healthCheck.enabled }}
-            - {{ print "--http-server-port=" (default .Values.dispatcher.healthCheck.port 8081) | quote }}
-            {{- end }}
-            - {{ print "--dapp-address=" (required "A valid .Values.dapp.contractAddress is required" .Values.dapp.contractAddress) | quote }}
-            - {{ print "--dapp-deploy-block-hash=" (required "A valid .Values.dapp.blockHash is required" .Values.dapp.blockHash) | quote }}
-            {{- if .Values.dapp.network }}
-            - {{ print "--chain-id=" (include "dapp.chainID" .) | quote }}
-            {{- end }}
-            {{- range .Values.dispatcher.args }}
-            {{- end }}
-            {{- range .Values.dispatcher.extraArgs }}
-            - {{ . | quote}}
-            {{- end }}
-          {{- if .Values.dispatcher.healthCheck.enabled }}
-          livenessProbe:
-            httpGet:
-              path: /healthz
-              port: {{ (default 8081 .Values.dispatcher.healthCheck.port) }}
-            initialDelaySeconds: 3
-          {{- end }}
-          env:
-            - name: RUST_LOG
-              value: {{ .Values.dispatcher.logLevel }}
-            {{- if .Values.dispatcher.extraEnvVars }}
-            {{- include "tplvalues.render" (dict "value" .Values.dispatcher.extraEnvVars "context" $) | nindent 12 }}
-            {{- end }}
-          {{- if or .Values.dispatcher.extraEnvVarsCM .Values.dispatcher.extraEnvVarsSecret }}
-          envFrom:
-            {{- if .Values.dispatcher.extraEnvVarsCM }}
-            - configMapRef:
-                name: {{ include "tplvalues.render" ( dict "value" .Values.dispatcher.extraEnvVarsCM "context" $ ) }}
-            {{- end }}
-            {{- if .Values.dispatcher.extraEnvVarsSecret }}
-            - secretRef:
-                name: {{ include "tplvalues.render" ( dict "value" .Values.dispatcher.extraEnvVarsSecret "context" $ ) }}
-            {{- end }}
-          {{- end }}
-          volumeMounts:
-            {{- if (or .Values.dapp.mnemonic.value .Values.dapp.mnemonic.secretRef) }}
-            - name: mnemonic
-              mountPath: /var/run/secrets/mnemonic
-              readOnly: true
-            {{- end }}
-            {{- if .Values.dispatcher.extraVolumeMounts }}
-            {{- include "tplvalues.render" ( dict "value" .Values.dispatcher.extraVolumeMounts "context" $ ) | nindent 12 }}
-            {{- end }}
-
-      volumes:
-        {{- if (or .Values.dapp.mnemonic.value .Values.dapp.mnemonic.secretRef) }}
-        - name: mnemonic
-          secret:
-            {{- if .Values.dapp.mnemonic.value }}
-            secretName: {{ include "validator.fullname" . }}-mnemonic
-            {{- else }}
-            secretName: {{ .Values.dapp.mnemonic.secretRef }}
-            {{- end }}
-        {{- end }}
-        {{- if .Values.dispatcher.extraVolumes }}
-        {{- include "tplvalues.render" ( dict "value" .Values.dispatcher.extraVolumes "context" $ ) | nindent 8 }}
-        {{- end }}
-      {{- with .Values.dispatcher.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.dispatcher.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.dispatcher.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
diff --git a/charts/rollups-node/templates/graphql-server-deployment.yaml b/charts/rollups-node/templates/graphql-server-deployment.yaml
deleted file mode 100644
index b834e02..0000000
--- a/charts/rollups-node/templates/graphql-server-deployment.yaml
+++ /dev/null
@@ -1,105 +0,0 @@
-{{- /*
-(c) Cartesi and individual authors (see AUTHORS)
-SPDX-License-Identifier: Apache-2.0 (see LICENSE)
-*/}}
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "validator.fullname" . }}-graphql-server
-  labels: {{- include "validator.labels" . | nindent 4 }}
-spec:
-  replicas: {{ .Values.graphqlServer.replicaCount }}
-  selector:
-    matchLabels:
-      {{- include "validator.selectorLabels" . | nindent 6 }}
-      rollups.cartesi.io/component: graphql-server
-  template:
-    metadata:
-      labels:
-        {{- include "validator.selectorLabels" . | nindent 8 }}
-        rollups.cartesi.io/component: graphql-server
-    spec:
-      {{- with .Values.image.pullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      serviceAccountName: {{ include "validator.serviceAccountName" . }}
-      securityContext:
-        {{- toYaml .Values.graphqlServer.podSecurityContext | nindent 8 }}
-      initContainers:
-        {{- if .Values.graphqlServer.initContainers }}
-        {{- include "tplvalues.render" ( dict "value" .Values.graphqlServer.initContainers "context" $ ) | nindent 8 }}
-        {{- end }}
-      containers:
-        - name: graphql-server
-          image: {{ include "graphqlServer.image" . }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          resources:
-            {{- toYaml .Values.graphqlServer.resources | nindent 12 }}
-          {{- if .Values.graphqlServer.healthCheck.enabled }}
-          livenessProbe:
-            httpGet:
-              path: /healthz
-              port: {{ default 8085 .Values.graphqlServer.healthCheck.port }}
-            initialDelaySeconds: 3
-          {{- end }}
-          {{- if .Values.graphqlServer.command }}
-          command:
-          {{- include "tplvalues.render" (dict "value" .Values.graphqlServer.command "context" $) | nindent 12 }}
-          {{- end }}
-          args:
-            {{- if .Values.graphqlServer.healthCheck.enabled }}
-            - {{ print "--healthcheck-port=" (default 8085 .Values.graphqlServer.healthCheck.port) | quote }}
-            {{- end }}
-            {{- range .Values.graphqlServer.args }}
-            - {{ . | quote}}
-            {{- end }}
-            {{- range .Values.graphqlServer.extraArgs }}
-            - {{ . | quote}}
-            {{- end }}
-          env:
-            - name: RUST_LOG
-              value: {{ .Values.graphqlServer.logLevel }}
-            {{- if .Values.graphqlServer.extraEnvVars }}
-            {{- include "tplvalues.render" (dict "value" .Values.graphqlServer.extraEnvVars "context" $) | nindent 12 }}
-            {{- end }}
-            - name: GRAPHQL_HOST
-              value: "0.0.0.0"
-            - name: GRAPHQL_PORT
-              value: "4000"
-          envFrom:
-          {{- if or .Values.graphqlServer.extraEnvVarsCM .Values.graphqlServer.extraEnvVarsSecret }}
-            {{- if .Values.graphqlServer.extraEnvVarsCM }}
-            - configMapRef:
-                name: {{ include "tplvalues.render" ( dict "value" .Values.graphqlServer.extraEnvVarsCM "context" $ ) }}
-            {{- end }}
-            {{- if .Values.graphqlServer.extraEnvVarsSecret }}
-            - secretRef:
-                name: {{ include "tplvalues.render" ( dict "value" .Values.graphqlServer.extraEnvVarsSecret "context" $ ) }}
-            {{- end }}
-          {{- end }}
-          volumeMounts:
-            {{- if .Values.graphqlServer.extraVolumeMounts }}
-            {{- include "tplvalues.render" ( dict "value" .Values.graphqlServer.extraVolumeMounts "context" $ ) | nindent 12 }}
-            {{- end }}
-          ports:
-            - containerPort: 4000
-      {{- with .Values.graphqlServer.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.graphqlServer.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.graphqlServer.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-
-      volumes:
-        {{- if .Values.graphqlServer.extraVolumes }}
-        {{- include "tplvalues.render" ( dict "value" .Values.graphqlServer.extraVolumes "context" $ ) | nindent 8 }}
-        {{- end }}
diff --git a/charts/rollups-node/templates/graphql-server-ingress.yaml b/charts/rollups-node/templates/graphql-server-ingress.yaml
deleted file mode 100644
index 684cdc3..0000000
--- a/charts/rollups-node/templates/graphql-server-ingress.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-{{- /*
-(c) Cartesi and individual authors (see AUTHORS)
-SPDX-License-Identifier: Apache-2.0 (see LICENSE)
-*/}}
-
-{{- if .Values.ingress.enabled -}}
----
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: {{ include "validator.fullname" . }}-graphql-server
-  labels: {{- include "validator.labels" . | nindent 4 }}
-  annotations:
-  {{- range $key, $value := .Values.ingress.annotations }}
-    {{ $key }}: {{ $value | quote }}
-  {{- end }}
-  {{- range $key, $value := .Values.graphqlServer.ingress.annotations }}
-    {{ $key }}: {{ $value | quote }}
-  {{- end }}
-spec:
-  {{- if .Values.ingress.ingressClassName }}
-  ingressClassName: {{ .Values.ingress.ingressClassName }}
-  {{- end }}
-  rules:
-    - host: {{ .Values.dapp.contractAddress | lower }}.{{ .Values.ingress.subDomain }}
-      http: &http
-        paths:
-          - pathType: Prefix
-            path: /
-            backend:
-              service:
-                name: {{ include "validator.fullname" . }}-graphql-server
-                port:
-                  number: {{ .Values.graphqlServer.service.port }}
-    {{- if .Values.ingress.addReleaseNameAsHost }}
-    - host: {{ .Release.Name | lower }}.{{ .Values.ingress.subDomain }}
-      http: *http
-    {{- end }}
-{{- end }}
\ No newline at end of file
diff --git a/charts/rollups-node/templates/graphql-server-service.yaml b/charts/rollups-node/templates/graphql-server-service.yaml
deleted file mode 100644
index 274361f..0000000
--- a/charts/rollups-node/templates/graphql-server-service.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-{{- /*
-(c) Cartesi and individual authors (see AUTHORS)
-SPDX-License-Identifier: Apache-2.0 (see LICENSE)
-*/}}
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "validator.fullname" . }}-graphql-server
-  labels: {{- include "validator.labels" . | nindent 4 }}
-spec:
-  type: {{ .Values.graphqlServer.service.type }}
-  ports:
-    - port: {{ .Values.graphqlServer.service.port }}
-      targetPort: 4000
-      protocol: TCP
-      name: graphql
-  selector:
-    {{- include "validator.selectorLabels" . | nindent 4 }}
-    rollups.cartesi.io/component: graphql-server
diff --git a/charts/rollups-node/templates/indexer-deployment.yaml b/charts/rollups-node/templates/indexer-deployment.yaml
deleted file mode 100644
index 064490b..0000000
--- a/charts/rollups-node/templates/indexer-deployment.yaml
+++ /dev/null
@@ -1,126 +0,0 @@
-{{- /*
-(c) Cartesi and individual authors (see AUTHORS)
-SPDX-License-Identifier: Apache-2.0 (see LICENSE)
-*/}}
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "validator.fullname" . }}-indexer
-  labels: {{- include "validator.labels" . | nindent 4 }}
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      {{- include "validator.selectorLabels" . | nindent 6 }}
-      rollups.cartesi.io/component: indexer
-  strategy:
-    type: Recreate
-  template:
-    metadata:
-      {{- with .Values.indexer.podAnnotations }}
-      annotations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      labels:
-        {{- include "validator.selectorLabels" . | nindent 8 }}
-        rollups.cartesi.io/component: indexer
-    spec:
-      {{- with .Values.image.pullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      serviceAccountName: {{ include "validator.serviceAccountName" . }}
-      securityContext:
-        {{- toYaml .Values.indexer.podSecurityContext | nindent 8 }}
-      initContainers:
-        {{- if .Values.indexer.initContainers }}
-        {{- include "tplvalues.render" ( dict "value" .Values.indexer.initContainers "context" $ ) | nindent 8 }}
-        {{- end }}
-      containers:
-        - name: rollups-indexer
-          image: {{ include "indexer.image" . }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          resources:
-            {{- toYaml .Values.indexer.resources | nindent 12 }}
-          {{- if .Values.indexer.command }}
-          command:
-          {{- include "tplvalues.render" (dict "value" .Values.indexer.command "context" $) | nindent 12 }}
-          {{- end }}
-          args:
-            {{- if .Values.indexer.healthCheck.enabled }}
-            - {{ print "--healthcheck-port=" (default 8082 .Values.indexer.healthCheck.port) | quote }}
-            {{- end }}
-            - {{ print "--dapp-contract-address=" .Values.dapp.contractAddress | quote }}
-            {{- if .Values.dapp.network }}
-            - {{ print "--chain-id=" (include "dapp.chainID" .) | quote }}
-            {{- end }}
-            {{- range .Values.indexer.args }}
-            - {{ . | quote}}
-            {{- end }}
-            {{- range .Values.indexer.extraArgs }}
-            - {{ . | quote}}
-            {{- end }}
-          {{- if .Values.indexer.healthCheck.enabled }}
-          livenessProbe:
-            httpGet:
-              path: /healthz
-              port: {{ default 8082 .Values.indexer.healthCheck.port }}
-            initialDelaySeconds: 3
-          {{- end }}
-          env:
-            - name: RUST_LOG
-              value: {{ .Values.indexer.logLevel }}
-            {{- if .Values.indexer.extraEnvVars }}
-            {{- include "tplvalues.render" (dict "value" .Values.indexer.extraEnvVars "context" $) | nindent 12 }}
-            {{- end }}
-          envFrom:
-          {{- if or .Values.indexer.extraEnvVarsCM .Values.indexer.extraEnvVarsSecret }}
-            {{- if .Values.indexer.extraEnvVarsCM }}
-            - configMapRef:
-                name: {{ include "tplvalues.render" ( dict "value" .Values.indexer.extraEnvVarsCM "context" $ ) }}
-            {{- end }}
-            {{- if .Values.indexer.extraEnvVarsSecret }}
-            - secretRef:
-                name: {{ include "tplvalues.render" ( dict "value" .Values.indexer.extraEnvVarsSecret "context" $ ) }}
-            {{- end }}
-          {{- end }}
-          volumeMounts:
-            {{- if .Values.indexer.extraVolumeMounts }}
-            {{- include "tplvalues.render" ( dict "value" .Values.indexer.extraVolumeMounts "context" $ ) | nindent 12 }}
-            {{- end }}
-
-      volumes:
-        - name: dispatcher-lib
-          emptyDir: {}
-        - name: dapp
-          configMap:
-            name: "{{ include "validator.fullname" . }}-dapp"
-            items:
-              - key: "dapp.json"
-                path: "dapp.json"
-        {{- if (or .Values.dapp.mnemonic.value .Values.dapp.mnemonic.secretRef) }}
-        - name: mnemonic
-          secret:
-            {{- if .Values.dapp.mnemonic.value }}
-            secretName: {{ include "validator.fullname" . }}-mnemonic
-            {{- else }}
-            secretName: {{ .Values.dapp.mnemonic.secretRef }}
-            {{- end }}
-        {{- end }}
-        {{- if .Values.indexer.extraVolumes }}
-        {{- include "tplvalues.render" ( dict "value" .Values.indexer.extraVolumes "context" $ ) | nindent 8 }}
-        {{- end }}
-      {{- with .Values.indexer.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.indexer.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.indexer.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
diff --git a/charts/rollups-node/templates/inspect-server-ingress.yaml b/charts/rollups-node/templates/ingress.yaml
similarity index 56%
rename from charts/rollups-node/templates/inspect-server-ingress.yaml
rename to charts/rollups-node/templates/ingress.yaml
index ce8719d..de05ea4 100644
--- a/charts/rollups-node/templates/inspect-server-ingress.yaml
+++ b/charts/rollups-node/templates/ingress.yaml
@@ -8,32 +8,43 @@ SPDX-License-Identifier: Apache-2.0 (see LICENSE)
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: {{ include "validator.fullname" . }}-inspect
+  name: {{ include "validator.fullname" . }}-validator
   labels: {{- include "validator.labels" . | nindent 4 }}
   annotations:
   {{- range $key, $value := .Values.ingress.annotations }}
     {{ $key }}: {{ $value | quote }}
   {{- end }}
-  {{- range $key, $value := .Values.inspectServer.ingress.annotations }}
-    {{ $key }}: {{ $value | quote }}
-  {{- end }}
 spec:
   {{- if .Values.ingress.ingressClassName }}
   ingressClassName: {{ .Values.ingress.ingressClassName }}
   {{- end }}
   rules:
     - host: {{ .Values.dapp.contractAddress | lower }}.{{ .Values.ingress.subDomain }}
-      http: &http
+      http: &graphql
+        paths:
+          - pathType: Prefix
+            path: /
+            backend:
+              service:
+                name: {{ include "validator.fullname" . }}-validator
+                port:
+                  number: 4000
+    {{- if .Values.ingress.addReleaseNameAsHost }}
+    - host: {{ .Release.Name | lower }}.{{ .Values.ingress.subDomain }}
+      http: *graphql
+    {{- end }}
+    - host: {{ .Values.dapp.contractAddress | lower }}.{{ .Values.ingress.subDomain }}
+      http: &inspect
         paths:
           - pathType: Prefix
             path: /inspect
             backend:
               service:
-                name: {{ include "validator.fullname" . }}-inspect-server
+                name: {{ include "validator.fullname" . }}-validator
                 port:
-                  number: {{ .Values.inspectServer.service.port }}
+                  number: 5005
     {{- if .Values.ingress.addReleaseNameAsHost }}
     - host: {{ .Release.Name | lower }}.{{ .Values.ingress.subDomain }}
-      http: *http
+      http: *inspacet
     {{- end }}
 {{- end }}
diff --git a/charts/rollups-node/templates/inspect-server-deployment.yaml b/charts/rollups-node/templates/inspect-server-deployment.yaml
deleted file mode 100644
index 2a81bcd..0000000
--- a/charts/rollups-node/templates/inspect-server-deployment.yaml
+++ /dev/null
@@ -1,103 +0,0 @@
-{{- /*
-(c) Cartesi and individual authors (see AUTHORS)
-SPDX-License-Identifier: Apache-2.0 (see LICENSE)
-*/}}
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "validator.fullname" . }}-inspect-server
-  labels: {{- include "validator.labels" . | nindent 4 }}
-spec:
-  replicas: {{ .Values.inspectServer.replicaCount }}
-  selector:
-    matchLabels:
-      {{- include "validator.selectorLabels" . | nindent 6 }}
-      rollups.cartesi.io/component: inspect-server
-  template:
-    metadata:
-      labels:
-        {{- include "validator.selectorLabels" . | nindent 8 }}
-        rollups.cartesi.io/component: inspect-server
-    spec:
-      {{- with .Values.image.pullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      serviceAccountName: {{ include "validator.serviceAccountName" . }}
-      securityContext:
-        {{- toYaml .Values.inspectServer.podSecurityContext | nindent 8 }}
-      initContainers:
-        {{- if .Values.inspectServer.initContainers }}
-        {{- include "tplvalues.render" ( dict "value" .Values.inspectServer.initContainers "context" $ ) | nindent 8 }}
-        {{- end }}
-      containers:
-        - name: rollups-inspect-server
-          image: {{ include "inspectServer.image" . }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          resources:
-            {{- toYaml .Values.inspectServer.resources | nindent 12 }}
-          {{- if .Values.inspectServer.healthCheck.enabled }}
-          livenessProbe:
-            httpGet:
-              path: /healthz
-              port: {{ default 8084 .Values.inspectServer.healthCheck.port }}
-            initialDelaySeconds: 3
-          {{- end }}
-          {{- if .Values.inspectServer.command }}
-          command:
-          {{- include "tplvalues.render" (dict "value" .Values.inspectServer.command "context" $) | nindent 12 }}
-          {{- end }}
-          args:
-            - {{ print "--server-manager-address=" (include "validator.fullname" .) "-server-manager:5001" }}
-            {{- if .Values.inspectServer.healthCheck.enabled }}
-            - {{ print "--healthcheck-port=" (default 8084 .Values.inspectServer.healthCheck.port) | quote }}
-            {{- end }}
-            {{- range .Values.inspectServer.args }}
-            - {{ . | quote}}
-            {{- end }}
-            {{- range .Values.inspectServer.extraArgs }}
-            - {{ . | quote}}
-            {{- end }}
-          env:
-            - name: RUST_LOG
-              value: {{ .Values.inspectServer.logLevel }}
-            {{- if .Values.inspectServer.extraEnvVars }}
-            {{- include "tplvalues.render" (dict "value" .Values.inspectServer.extraEnvVars "context" $) | nindent 12 }}
-            {{- end }}
-          {{- if or .Values.inspectServer.extraEnvVarsCM .Values.inspectServer.extraEnvVarsSecret }}
-          envFrom:
-            {{- if .Values.inspectServer.extraEnvVarsCM }}
-            - configMapRef:
-                name: {{ include "tplvalues.render" ( dict "value" .Values.inspectServer.extraEnvVarsCM "context" $ ) }}
-            {{- end }}
-            {{- if .Values.inspectServer.extraEnvVarsSecret }}
-            - secretRef:
-                name: {{ include "tplvalues.render" ( dict "value" .Values.inspectServer.extraEnvVarsSecret "context" $ ) }}
-            {{- end }}
-          {{- end }}
-          volumeMounts:
-            {{- if .Values.inspectServer.extraVolumeMounts }}
-            {{- include "tplvalues.render" ( dict "value" .Values.inspectServer.extraVolumeMounts "context" $ ) | nindent 12 }}
-            {{- end }}
-          ports:
-            - containerPort: 5005
-
-      {{- with .Values.inspectServer.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.inspectServer.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.inspectServer.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-
-      volumes:
-        {{- if .Values.inspectServer.extraVolumes }}
-        {{- include "tplvalues.render" ( dict "value" .Values.inspectServer.extraVolumes "context" $ ) | nindent 8 }}
-        {{- end }}
diff --git a/charts/rollups-node/templates/server-manager-deployment.yaml b/charts/rollups-node/templates/server-manager-deployment.yaml
deleted file mode 100644
index 66200b1..0000000
--- a/charts/rollups-node/templates/server-manager-deployment.yaml
+++ /dev/null
@@ -1,186 +0,0 @@
-{{- /*
-(c) Cartesi and individual authors (see AUTHORS)
-SPDX-License-Identifier: Apache-2.0 (see LICENSE)
-*/}}
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "validator.fullname" . }}-server-manager
-  labels: {{- include "validator.labels" . | nindent 4 }}
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      {{- include "validator.selectorLabels" . | nindent 6 }}
-      rollups.cartesi.io/component: server-manager
-  strategy:
-    type: Recreate
-  template:
-    metadata:
-      {{- with .Values.serverManager.podAnnotations }}
-      annotations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      labels:
-        {{- include "validator.selectorLabels" . | nindent 8 }}
-        rollups.cartesi.io/component: server-manager
-    spec:
-      {{- with .Values.image.pullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      serviceAccountName: {{ include "validator.serviceAccountName" . }}
-      securityContext:
-        {{- toYaml .Values.serverManager.podSecurityContext | nindent 8 }}
-      initContainers:
-        {{- if .Values.serverManager.initContainers }}
-        {{- include "tplvalues.render" ( dict "value" .Values.serverManager.initContainers "context" $ ) | nindent 8 }}
-        {{- end }}
-        {{- if .Values.serverManager.shareSnapshotFromImage }}
-        - name: share-machine-snapshot
-          image: {{ required "A valid .Values.dapp.image is required" .Values.dapp.image }}
-          command:
-            - cp
-            - -avr
-            - /var/opt/cartesi/machine-snapshots/0_0
-            - /var/opt/cartesi/machine-snapshots/latest
-            - /tmp/machine-snapshots/
-          volumeMounts:
-            - name: shared-machine-snapshots
-              mountPath: /tmp/machine-snapshots
-              readOnly: false
-        {{- end }}
-      containers:
-        - name: advance-runner
-          image: {{ include "serverManager.advanceRunner.image" . }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          resources:
-            {{- toYaml .Values.serverManager.advanceRunner.resources | nindent 12 }}
-          {{- if .Values.serverManager.advanceRunner.command }}
-          command:
-          {{- include "tplvalues.render" (dict "value" .Values.serverManager.advanceRunner.command "context" $) | nindent 12 }}
-          {{- end }}
-          args:
-            - {{ print "--provider-http-endpoint=" (required "A valid .Values.dapp.httpProvider is required" .Values.dapp.httpProvider) | quote }}
-            {{- if .Values.serverManager.advanceRunner.healthCheck.enabled }}
-            - {{ print "--healthcheck-port=" (default 8083 .Values.serverManager.advanceRunner.healthCheck.port) | quote }}
-            {{- end }}
-            {{- if .Values.dapp.network }}
-            - {{ print "--chain-id=" (include "dapp.chainID" .) | quote }}
-            {{- end }}
-            - {{ print "--dapp-contract-address=" (required "A valid .Values.dapp.contractAddress is required" .Values.dapp.contractAddress) | quote }}
-            {{- range .Values.serverManager.advanceRunner.args }}
-            - {{ . | quote}}
-            {{- end }}
-            {{- range .Values.serverManager.advanceRunner.extraArgs }}
-            - {{ . | quote}}
-            {{- end }}
-          {{- if .Values.serverManager.advanceRunner.healthCheck.enabled }}
-          livenessProbe:
-            httpGet:
-              path: /healthz
-              port: {{ default 8083 .Values.serverManager.advanceRunner.healthCheck.port }}
-            initialDelaySeconds: 3
-          {{- end }}
-          env:
-            - name: RUST_LOG
-              value: {{ .Values.serverManager.advanceRunner.logLevel }}
-            {{- if .Values.serverManager.advanceRunner.extraEnvVars }}
-            {{- include "tplvalues.render" (dict "value" .Values.serverManager.advanceRunner.extraEnvVars "context" $) | nindent 12 }}
-            {{- end }}
-          {{- if or .Values.serverManager.advanceRunner.extraEnvVarsCM .Values.serverManager.advanceRunner.extraEnvVarsSecret }}
-          envFrom:
-            {{- if .Values.serverManager.advanceRunner.extraEnvVarsCM }}
-            - configMapRef:
-                name: {{ include "tplvalues.render" ( dict "value" .Values.serverManager.advanceRunner.extraEnvVarsCM "context" $ ) }}
-            {{- end }}
-            {{- if .Values.serverManager.advanceRunner.extraEnvVarsSecret }}
-            - secretRef:
-                name: {{ include "tplvalues.render" ( dict "value" .Values.serverManager.advanceRunner.extraEnvVarsSecret "context" $ ) }}
-            {{- end }}
-          {{- end }}
-          volumeMounts:
-            {{- if .Values.serverManager.shareSnapshotFromImage }}
-            - name: shared-machine-snapshots
-              mountPath: /var/opt/cartesi/machine-snapshots
-              readOnly: false
-            {{- end }}
-            {{- if .Values.serverManager.advanceRunner.extraVolumeMounts }}
-            {{- include "tplvalues.render" ( dict "value" .Values.serverManager.advanceRunner.extraVolumeMounts "context" $ ) | nindent 12 }}
-            {{- end }}
-
-        - name: server-manager
-          image: {{ required "A valid .Values.dapp.image is required" .Values.dapp.image }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          resources:
-            {{- toYaml .Values.serverManager.resources | nindent 12 }}
-          livenessProbe:
-            grpc:
-              port: 5001
-            initialDelaySeconds: 3
-            periodSeconds: 5
-          {{- if .Values.serverManager.command }}
-          command:
-          {{- include "tplvalues.render" (dict "value" .Values.serverManager.command "context" $) | nindent 12 }}
-          {{- end }}
-          args:
-            {{- range .Values.serverManager.args }}
-            - {{ . | quote}}
-            {{- end }}
-            {{- range .Values.serverManager.extraArgs }}
-            - {{ . | quote}}
-            {{- end }}
-          ports:
-            - containerPort: 5001
-          env:
-            - name: SERVER_MANAGER_LOG_LEVEL
-              value: {{ .Values.serverManager.logLevel }}
-            - name: REMOTE_CARTESI_MACHINE_LOG_LEVEL
-              value: {{ coalesce .Values.serverManager.remoteCartesiMachine.logLevel .Values.serverManager.logLevel }}
-            {{- if .Values.serverManager.extraEnvVars }}
-            {{- include "tplvalues.render" (dict "value" .Values.serverManager.extraEnvVars "context" $) | nindent 12 }}
-            {{- end }}
-          {{- if or .Values.serverManager.extraEnvVarsCM .Values.serverManager.extraEnvVarsSecret }}
-          envFrom:
-            {{- if .Values.serverManager.extraEnvVarsCM }}
-            - configMapRef:
-                name: {{ include "tplvalues.render" ( dict "value" .Values.serverManager.extraEnvVarsCM "context" $ ) }}
-            {{- end }}
-            {{- if .Values.serverManager.extraEnvVarsSecret }}
-            - secretRef:
-                name: {{ include "tplvalues.render" ( dict "value" .Values.serverManager.extraEnvVarsSecret "context" $ ) }}
-            {{- end }}
-          {{- end }}
-          volumeMounts:
-            {{- if .Values.serverManager.shareSnapshotFromImage }}
-            - name: shared-machine-snapshots
-              mountPath: /var/opt/cartesi/machine-snapshots
-              readOnly: false
-            {{- end }}
-            {{- if .Values.serverManager.extraVolumeMounts }}
-            {{- include "tplvalues.render" ( dict "value" .Values.serverManager.extraVolumeMounts "context" $ ) | nindent 12 }}
-            {{- end }}
-
-      volumes:
-        {{- if .Values.serverManager.shareSnapshotFromImage }}
-        - name: shared-machine-snapshots
-          emptyDir: {}
-        {{- end }}
-        {{- if .Values.serverManager.extraVolumes }}
-        {{- include "tplvalues.render" ( dict "value" .Values.serverManager.extraVolumes "context" $ ) | nindent 8 }}
-        {{- end }}
-      {{- with .Values.serverManager.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.serverManager.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.serverManager.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-
diff --git a/charts/rollups-node/templates/server-manager-service.yaml b/charts/rollups-node/templates/server-manager-service.yaml
deleted file mode 100644
index ca38b33..0000000
--- a/charts/rollups-node/templates/server-manager-service.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-{{- /*
-(c) Cartesi and individual authors (see AUTHORS)
-SPDX-License-Identifier: Apache-2.0 (see LICENSE)
-*/}}
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "validator.fullname" . }}-server-manager
-  labels: {{- include "validator.labels" . | nindent 4 }}
-spec:
-  type: {{ .Values.serverManager.service.type }}
-  ports:
-    - port: {{ .Values.serverManager.service.port }}
-      targetPort: 5001
-      protocol: TCP
-      name: server-manager
-  selector:
-    {{- include "validator.selectorLabels" . | nindent 4 }}
-    rollups.cartesi.io/component: server-manager
diff --git a/charts/rollups-node/templates/inspect-server-service.yaml b/charts/rollups-node/templates/service.yaml
similarity index 63%
rename from charts/rollups-node/templates/inspect-server-service.yaml
rename to charts/rollups-node/templates/service.yaml
index 78f93ac..d750f6d 100644
--- a/charts/rollups-node/templates/inspect-server-service.yaml
+++ b/charts/rollups-node/templates/service.yaml
@@ -7,15 +7,18 @@ SPDX-License-Identifier: Apache-2.0 (see LICENSE)
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "validator.fullname" . }}-inspect-server
+  name: {{ include "validator.fullname" . }}-validator
   labels: {{- include "validator.labels" . | nindent 4 }}
 spec:
-  type: {{ .Values.inspectServer.service.type }}
+  type: {{ .Values.validator.service.type }}
   ports:
-    - port: {{ .Values.inspectServer.service.port }}
+    - port: 4000
+      targetPort: 4000
+      protocol: TCP
+      name: graphql-server
+    - port: 5005
       targetPort: 5005
       protocol: TCP
       name: inspect-server
   selector:
     {{- include "validator.selectorLabels" . | nindent 4 }}
-    rollups.cartesi.io/component: inspect-server
diff --git a/charts/rollups-node/templates/state-server-deployment.yaml b/charts/rollups-node/templates/state-server-deployment.yaml
deleted file mode 100644
index 7469ad2..0000000
--- a/charts/rollups-node/templates/state-server-deployment.yaml
+++ /dev/null
@@ -1,101 +0,0 @@
-{{- /*
-(c) Cartesi and individual authors (see AUTHORS)
-SPDX-License-Identifier: Apache-2.0 (see LICENSE)
-*/}}
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "validator.fullname" . }}-state-server
-  labels: {{- include "validator.labels" . | nindent 4 }}
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      {{- include "validator.selectorLabels" . | nindent 6 }}
-      rollups.cartesi.io/component: state-server
-  template:
-    metadata:
-      {{- with .Values.stateServer.podAnnotations }}
-      annotations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      labels:
-        {{- include "validator.selectorLabels" . | nindent 8 }}
-        rollups.cartesi.io/component: state-server
-    spec:
-      {{- with .Values.image.pullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      serviceAccountName: {{ include "validator.serviceAccountName" . }}
-      securityContext:
-        {{- toYaml .Values.stateServer.podSecurityContext | nindent 8 }}
-      initContainers:
-        {{- if .Values.stateServer.initContainers }}
-        {{- include "tplvalues.render" ( dict "value" .Values.stateServer.initContainers "context" $ ) | nindent 8 }}
-        {{- end }}
-      containers:
-        - name: state-server
-          image: {{ include "stateServer.image" . }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          resources:
-            {{- toYaml .Values.stateServer.resources | nindent 12 }}
-          {{- if .Values.stateServer.command }}
-          command:
-          {{- include "tplvalues.render" (dict "value" .Values.stateServer.command "context" $) | nindent 12 }}
-          {{- end }}
-          args:
-            - {{ print "--bh-http-endpoint=" (required "A valid .Values.dapp.httpProvider is required" .Values.dapp.httpProvider) | quote }}
-            - {{ print "--bh-ws-endpoint=" (required "A valid .Values.dapp.wsProvider is required" .Values.dapp.wsProvider) | quote }}
-            {{- range .Values.stateServer.args }}
-            - {{ . | quote}}
-            {{- end }}
-            {{- range .Values.stateServer.extraArgs }}
-            - {{ . | quote}}
-            {{- end }}
-          livenessProbe:
-            grpc:
-              port: 50051
-            initialDelaySeconds: 3
-          env:
-            - name: RUST_LOG
-              value: {{ .Values.stateServer.logLevel }}
-            {{- if .Values.stateServer.extraEnvVars }}
-            {{- include "tplvalues.render" (dict "value" .Values.stateServer.extraEnvVars "context" $) | nindent 12 }}
-            {{- end }}
-          {{- if or .Values.stateServer.extraEnvVarsCM .Values.stateServer.extraEnvVarsSecret }}
-          envFrom:
-            {{- if .Values.stateServer.extraEnvVarsCM }}
-            - configMapRef:
-                name: {{ include "tplvalues.render" ( dict "value" .Values.stateServer.extraEnvVarsCM "context" $ ) }}
-            {{- end }}
-            {{- if .Values.stateServer.extraEnvVarsSecret }}
-            - secretRef:
-                name: {{ include "tplvalues.render" ( dict "value" .Values.stateServer.extraEnvVarsSecret "context" $ ) }}
-            {{- end }}
-          {{- end }}
-          ports:
-            - containerPort: 50051
-          volumeMounts:
-            {{- if .Values.stateServer.extraVolumeMounts }}
-            {{- include "tplvalues.render" ( dict "value" .Values.stateServer.extraVolumeMounts "context" $ ) | nindent 12 }}
-            {{- end }}
-
-      volumes:
-        {{- if .Values.stateServer.extraVolumes }}
-        {{- include "tplvalues.render" ( dict "value" .Values.stateServer.extraVolumes "context" $ ) | nindent 8 }}
-        {{- end }}
-      {{- with .Values.stateServer.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.stateServer.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.stateServer.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
diff --git a/charts/rollups-node/templates/state-server-service.yaml b/charts/rollups-node/templates/state-server-service.yaml
deleted file mode 100644
index 79ecd05..0000000
--- a/charts/rollups-node/templates/state-server-service.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-{{- /*
-(c) Cartesi and individual authors (see AUTHORS)
-SPDX-License-Identifier: Apache-2.0 (see LICENSE)
-*/}}
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "validator.fullname" . }}-state-server
-  labels: {{- include "validator.labels" . | nindent 4 }}
-spec:
-  type: {{ .Values.stateServer.service.type }}
-  ports:
-    - port: {{ .Values.stateServer.service.port }}
-      targetPort: 50051
-      protocol: TCP
-      name: state-server
-  selector:
-    {{- include "validator.selectorLabels" . | nindent 4 }}
-    rollups.cartesi.io/component: state-server
diff --git a/charts/rollups-node/templates/tests/test-connection.yaml b/charts/rollups-node/templates/tests/test-connection.yaml
index bb61498..1b46f9f 100644
--- a/charts/rollups-node/templates/tests/test-connection.yaml
+++ b/charts/rollups-node/templates/tests/test-connection.yaml
@@ -10,5 +10,5 @@ spec:
     - name: http-check
       image: busybox
       command: ['wget']
-      args: ['--spider', '--timeout=5', 'http://{{ include "validator.fullname" . }}-graphql-server:{{ .Values.graphqlServer.service.port }}/graphql']
+      args: ['--spider', '--timeout=5', 'http://{{ include "validator.fullname" . }}-graphql-server:4000/graphql']
   restartPolicy: Never
\ No newline at end of file
diff --git a/charts/rollups-node/values.yaml b/charts/rollups-node/values.yaml
index 922ed84..9a342f5 100644
--- a/charts/rollups-node/values.yaml
+++ b/charts/rollups-node/values.yaml
@@ -10,10 +10,9 @@ dapp:
   # -- the contract address of the dapp deployed on the blockchain
   # (REQUIRED)
   contractAddress:
-  # -- the block hash of the block where the dapp was deployed
+  # -- the block number where the dapp was deployed
   # (REQUIRED)
-  blockHash:
-
+  blockNumber:
   # -- mnemonic defines the configuration for the mnemonic
   # use value or secretRef, never both
   mnemonic:
@@ -48,7 +47,7 @@ global:
     # -- Global Docker image registry
     registry: docker.io
     # -- Global Docker Image tag
-    tag: 1.2.0
+    tag: 1.3.0
 
 ## seviceAccount configuration to be used by the rollups-validator-node
 ##
@@ -103,7 +102,7 @@ ingress:
 # -- Array of extra objects to deploy with the release
 extraDeploy: []
 
-dispatcher:
+validator:
   # -- Set the dispatcher docker image
   image:
     registry:
@@ -151,7 +150,7 @@ dispatcher:
     port: 8081
 
   # -- Override default container command (useful when using custom images)
-  command: ["cartesi-rollups-dispatcher"]
+  command: ["cartesi-rollups-node"]
 
   # -- Override default container args (useful when using custom images)
   args: []
@@ -159,102 +158,7 @@ dispatcher:
   # -- Extra arguments for dispatcher
   extraArgs: []
 
-  # -- Array with extra environment variables to add to validator.dispatcher container
-  ## e.g:
-  ## extraEnvVars:
-  ##   - name: FOO
-  ##     value: "bar"
-  ##
-  extraEnvVars: []
-
-  # -- Name of existing ConfigMap containing extra env vars for dispatcher container
-  ##
-  extraEnvVarsCM: ""
-
-  # -- Name of existing Secret containing extra env vars for dispatcher container
-  ##
-  extraEnvVarsSecret: ""
-
-  # -- Set dispatcher container Security Context
-  securityContext:
-    {}
-    ## capabilities:
-    ##   drop:
-    ##   - ALL
-    ## readOnlyRootFilesystem: true
-    ## runAsNonRoot: true
-    ## runAsUser: 1000
-
-  # -- Set dispatcher container resources
-  resources:
-    {}
-    ## limits:
-    ##   cpu: 100m
-    ##   memory: 128Mi
-    ## requests:
-    ##   cpu: 100m
-    ##   memory: 128Mi
-
-  # -- Optionally specify extra list of additional volumeMounts for the dispatcher container(s)
-  extraVolumeMounts: []
-
-authorityClaimer:
-  # -- Set the authorityClaimer docker image
-  image:
-    registry:
-    repository: cartesi/rollups-node
-    tag:
-    digest:
-
-  # -- Node labels for validator pods assignment
-  nodeSelector: {}
-
-  # -- Tolerations for validator pods assignment
-  tolerations: []
-
-  # -- Affinity for validator pods assignment
-  affinity: {}
-
-  # -- add additional init containers to the authorityClaimer pod(s)
-  ## Example
-  ##
-  ## initContainers:
-  ##   - name: do-something
-  ##     image: busybox
-  ##     command: ['do', 'something']
-  ##
-  initContainers: []
-
-  # -- validator replicas pod's Security Context
-  podSecurityContext:
-    {}
-    ## fsGroup: 2000
-
-  # -- Annotations for Validator replicas pods
-  podAnnotations: {}
-
-  # -- Optionally specify extra list of additional volumes for the validator pod(s)
-  extraVolumes: []
-
-  # -- The RUST_LOG level can be set to trace, debug, info, warn, error, or off.
-  logLevel: info
-
-  healthCheck:
-    # -- enable/disable health check for authorityClaimer
-    enabled: true
-    # -- define the health check port for authorityClaimer
-    port: 8086
-
-  # -- Override default container command (useful when using custom images)
-  command: ["cartesi-rollups-authority-claimer"]
-
-  # -- Override default container args (useful when using custom images)
-  args: []
-
-  # -- Extra arguments for authorityClaimer
-  extraArgs: []
-
-  # -- Array with extra environment variables to add to validator.authorityClaimer container
+  # -- Array with extra environment variables to add to validator.validator Pod
   ## e.g:
   ## extraEnvVars:
   ##   - name: FOO
@@ -262,203 +166,19 @@ authorityClaimer:
   ##
   extraEnvVars: []
 
-  # -- Name of existing ConfigMap containing extra env vars for authorityClaimer container
+  # -- Name of existing ConfigMap containing extra env vars for validator Pod
   ##
   extraEnvVarsCM: ""
 
-  # -- Name of existing Secret containing extra env vars for authorityClaimer container
+  # -- Name of existing Secret containing extra env vars for validator Pod
   ##
   extraEnvVarsSecret: ""
 
-  # -- Set authorityClaimer container Security Context
-  securityContext:
-    {}
-    ## capabilities:
-    ##   drop:
-    ##   - ALL
-    ## readOnlyRootFilesystem: true
-    ## runAsNonRoot: true
-    ## runAsUser: 1000
-
-  # -- Set authorityClaimer container resources
-  resources:
-    {}
-    ## limits:
-    ##   cpu: 100m
-    ##   memory: 128Mi
-    ## requests:
-    ##   cpu: 100m
-    ##   memory: 128Mi
-
-  # -- Optionally specify extra list of additional volumeMounts for the authorityClaimer container(s)
-  extraVolumeMounts: []
-
-stateServer:
-  # -- Set the stateServer docker image
-  image:
-    registry:
-    repository: cartesi/rollups-node
-    tag:
-    digest:
-
-  # -- Node labels for validator pods assignment
-  nodeSelector: {}
-
-  # -- Tolerations for validator pods assignment
-  tolerations: []
-
-  # -- Affinity for validator pods assignment
-  affinity: {}
-
-  # -- add additional init containers to the validator-node pod(s)
-  ## Example
-  ##
-  ## initContainers:
-  ##   - name: do-something
-  ##     image: busybox
-  ##     command: ['do', 'something']
-  ##
-  initContainers: []
-
-  # -- validator replicas pod's Security Context
-  podSecurityContext:
-    {}
-    ## fsGroup: 2000
-
-  # -- Annotations for Validator replicas pods
-  podAnnotations: {}
-
-  # -- Optionally specify extra list of additional volumes for the validator pod(s)
-  extraVolumes: []
-
-  # -- The RUST_LOG level can be set to trace, debug, info, warn, error, or off.
-  logLevel: info
-
-  # -- Override default container command (useful when using custom images)
-  command: ["cartesi-rollups-state-server"]
-
-  # -- Override default container args (useful when using custom images)
-  args: []
-
-  # -- Extra arguments for StateServer
-  extraArgs: []
-
-  # -- Array with extra environment variables to add to validator.stateServer container
-  ## e.g:
-  ## extraEnvVars:
-  ##   - name: FOO
-  ##     value: "bar"
-  ##
-  extraEnvVars: []
-
-  # -- Name of existing ConfigMap containing extra env vars for stateServer container
-  extraEnvVarsCM: ""
-
-  # -- Name of existing Secret containing extra env vars for stateServer container
-  extraEnvVarsSecret: ""
-
-  # -- Set StateServer container Security Context
-  securityContext:
-    {}
-    ## capabilities:
-    ##   drop:
-    ##   - ALL
-    ## readOnlyRootFilesystem: true
-    ## runAsNonRoot: true
-    ## runAsUser: 1000
-
   service:
-    # -- stateServer service type
+    # -- validator service type
     type: ClusterIP
-    # -- stateServer service port
-    port: 50051
-
-  # -- Set StateServer container resources
-  resources:
-    {}
-    ## limits:
-    ##   cpu: 100m
-    ##   memory: 128Mi
-    ## requests:
-    ##   cpu: 100m
-    ##   memory: 128Mi
 
-  # -- Optionally specify extra list of additional volumeMounts for the stateServer container(s)
-  extraVolumeMounts: []
-
-indexer:
-  # -- Set the indexer docker image
-  image:
-    registry:
-    repository: cartesi/rollups-node
-    tag:
-    digest:
-
-  # -- Node labels for validator pods assignment
-  nodeSelector: {}
-
-  # -- Tolerations for validator pods assignment
-  tolerations: []
-
-  # -- Affinity for validator pods assignment
-  affinity: {}
-
-  # -- add additional init containers to the validator-node pod(s)
-  ## Example
-  ##
-  ## initContainers:
-  ##   - name: do-something
-  ##     image: busybox
-  ##     command: ['do', 'something']
-  ##
-  initContainers: []
-
-  # -- validator replicas pod's Security Context
-  podSecurityContext:
-    {}
-    ## fsGroup: 2000
-
-  # -- Annotations for Validator replicas pods
-  podAnnotations: {}
-
-  # -- Optionally specify extra list of additional volumes for the validator pod(s)
-  extraVolumes: []
-
-  # -- The RUST_LOG level can be set to trace, debug, info, warn, error, or off.
-  logLevel: info
-
-  healthCheck:
-    # -- enable/disable health check for indexer
-    enabled: true
-    # -- define the health check port for indexer
-    port: 8082
-
-  # -- Override default container command (useful when using custom images)
-  command: ["cartesi-rollups-indexer"]
-
-  # -- Override default container args (useful when using custom images)
-  args: []
-
-  # -- Extra arguments for indexer
-  extraArgs: []
-
-  # -- Array with extra environment variables to add to validator.indexer container
-  ## e.g:
-  ## extraEnvVars:
-  ##   - name: FOO
-  ##     value: "bar"
-  ##
-  extraEnvVars: []
-
-  # -- Name of existing ConfigMap containing extra env vars for indexer container
-  ##
-  extraEnvVarsCM: ""
-
-  # -- Name of existing Secret containing extra env vars for indexer container
-  ##
-  extraEnvVarsSecret: ""
-
-  # -- Set indexer container Security Context
+  # -- Set validator Pod Security Context
   securityContext:
     {}
     ## capabilities:
@@ -468,394 +188,7 @@ indexer:
     ## runAsNonRoot: true
     ## runAsUser: 1000
 
-  # -- Set indexer container resources
-  resources:
-    {}
-    ## limits:
-    ##   cpu: 100m
-    ##   memory: 128Mi
-    ## requests:
-    ##   cpu: 100m
-    ##   memory: 128Mi
-
-  # -- Optionally specify extra list of additional volumeMounts for the indexer container(s)
-  ##
-  extraVolumeMounts: []
-
-## rollups-validator-node-server-manager Pod configuration
-##
-serverManager:
-  # -- Override the image defined in dapp.image
-  image:
-    registry:
-    repository: cartesi/rollups-node
-    tag:
-    digest:
-
-  # -- Node labels for pods assignment
-  nodeSelector: {}
-
-  # -- Tolerations for pods assignment
-  tolerations: []
-
-  # -- Affinity for pods assignment
-  affinity: {}
-
-  # -- Share cartesi-machine snpashot from dapp.image to advanceRunner and serverManager
-  # The image must be located at /var/opt/cartesi/share/machine-snapshots/0_0
-  shareSnapshotFromImage: true
-
-  # -- additional init containers to the ServerManager pod(s)
-  ## Example
-  ##
-  ## initContainers:
-  ##   - name: do-something
-  ##     image: busybox
-  ##     command: ['do', 'something']
-  ##
-  initContainers: []
-
-  # -- Set serverManager replicas pod's Security Context
-  podSecurityContext:
-    {}
-    ## fsGroup: 2000
-
-  # -- Annotations for serverManager replicas pods
-  podAnnotations: {}
-
-  ## serverManager.extraVolumes Optionally specify extra list of additional volumes for the serverManager pod(s)
-  ##
-  extraVolumes: []
-
-  # -- set SERVER_MANAGER_LOG_LEVEL env, can be set to trace, debug, info, warning, error, and fatal.
-  logLevel: info
-
-  # -- Override default container command (useful when using custom images)
-  command: []
-
-  # -- Override default container args (useful when using custom images)
-  args:
-    - "server-manager"
-    - "--manager-address=0.0.0.0:5001"
-
-  # -- Extra arguments for serverManager
-  extraArgs: []
-
-  # -- Name of existing ConfigMap containing extra env vars for serverManager container
-  extraEnvVarsCM: ""
-
-  # -- Name of existing Secret containing extra env vars for serverManager container
-  extraEnvVarsSecret: ""
-
-  remoteCartesiMachine:
-    # -- Set REMOTE_CARTESI_MACHINE_LOG_LEVEL env, can be set to trace, debug, info, warning, error, and fatal.
-    # defaults to serverManager.logLevel unless you provide a different value
-    logLevel:
-
-  # -- Array with extra environment variables to add to serverManager container
-  ## e.g:
-  ## extraEnvVars:
-  ##   - name: FOO
-  ##     value: "bar"
-  ##
-  extraEnvVars: []
-
-  service:
-    # -- serverManager service type
-    type: ClusterIP
-    # -- serverManager service port
-    port: 5001
-
-  # -- Set serverManager container Security Context
-  securityContext:
-    {}
-    ## capabilities:
-    ##   drop:
-    ##   - ALL
-    ## readOnlyRootFilesystem: true
-    ## runAsNonRoot: true
-    ## runAsUser: 1000
-
-  # -- Set serverManager container resources
-  resources:
-    {}
-    ## limits:
-    ##   cpu: 100m
-    ##   memory: 128Mi
-    ## requests:
-    ##   cpu: 100m
-    ##   memory: 128Mi
-
-  # -- Optionally specify extra list of additional volumeMounts for the serverManager container(s)
-  extraVolumeMounts: []
-
-  advanceRunner:
-    # -- Set the advanceRunner docker image
-    image:
-      registry:
-      repository: cartesi/rollups-node
-      tag:
-      digest:
-
-    # -- Set RUST_LOG env, can be trace, debug, info, warn, error, or off.
-    logLevel: info
-
-    healthCheck:
-      # -- enable/disable health check for advanceRunner
-      enabled: true
-      # -- define the health check port for advanceRunner
-      port: 8083
-
-    # -- verride default container command (useful when using custom images)
-    command: ["cartesi-rollups-advance-runner"]
-
-    # -- Override default container args (useful when using custom images)
-    args: []
-
-    # -- Extra arguments for advanceRunner
-    extraArgs: []
-
-    # -- Array with extra environment variables to add to serverManager.advanceRunner container
-    ## e.g:
-    ## extraEnvVars:
-    ##   - name: FOO
-    ##     value: "bar"
-    ##
-    extraEnvVars: []
-
-    # -- Name of existing ConfigMap containing extra env vars for advanceRunner container
-    extraEnvVarsCM: ""
-
-    # -- Name of existing Secret containing extra env vars for advanceRunner container
-    extraEnvVarsSecret: ""
-
-    # -- Set advanceRunner container Security Context
-    securityContext:
-      {}
-      ## capabilities:
-      ##   drop:
-      ##   - ALL
-      ## readOnlyRootFilesystem: true
-      ## runAsNonRoot: true
-      ## runAsUser: 1000
-
-    # -- Set advanceRunner container resources
-    resources:
-      {}
-      ## limits:
-      ##   cpu: 100m
-      ##   memory: 128Mi
-      ## requests:
-      ##   cpu: 100m
-      ##   memory: 128Mi
-
-    # -- Optionally specify extra list of additional volumeMounts for the serverManager.advanceRunner container(s)
-    extraVolumeMounts: []
-
-inspectServer:
-  # -- Set the inspectServer docker image
-  image:
-    registry:
-    repository: cartesi/rollups-node
-    tag:
-    digest:
-
-  # -- Number of endpoints replicas to deploy
-  replicaCount: 1
-
-  # -- Node labels for pods assignment
-  nodeSelector: {}
-
-  # -- Tolerations for pods assignment
-  tolerations: []
-
-  # -- Affinity for pods assignment
-  affinity: {}
-
-  # -- Add additional init containers to the endpoints pod(s)
-  ## Example
-  ##
-  ## initContainers:
-  ##   - name: do-something
-  ##     image: busybox
-  ##     command: ['do', 'something']
-  ##
-  initContainers: []
-
-  # -- Set endpoints replicas pod's Security Context
-  podSecurityContext:
-    {}
-    ## fsGroup: 2000
-
-  # -- Annotations for endpoints replicas pods
-  podAnnotations: {}
-
-  # -- Optionally specify extra list of additional volumes for the endpoints pod(s)
-  ##
-  extraVolumes: []
-
-  # -- The RUST_LOG level can be set to trace, debug, info, warn, error, or off.
-  logLevel: info
-
-  healthCheck:
-    # -- enable/disable healthcheck for inspectServer
-    enabled: true
-    # -- define healthcheck port for inspectServer
-    port: 8084
-
-  # -- Override default container command (useful when using custom images)
-  command: ["cartesi-rollups-inspect-server"]
-
-  # -- Override default container args (useful when using custom images)
-  args: []
-
-  # -- Extra arguments for inspectServer
-  extraArgs: []
-
-  # -- extraEnvVars Array with extra environment variables to add to endpoints.inspectServer container
-  ## e.g:
-  ## extraEnvVars:
-  ##   - name: FOO
-  ##     value: "bar"
-  ##
-  extraEnvVars: []
-
-  # -- extraEnvVarsCM Name of existing ConfigMap containing extra env vars for inspectServer container
-  extraEnvVarsCM: ""
-
-  # -- extraEnvVarsSecret Name of existing Secret containing extra env vars for inspectServer container
-  extraEnvVarsSecret: ""
-
-  # -- Set inspectServer container Security Context
-  securityContext:
-    {}
-    ## capabilities:
-    ##   drop:
-    ##   - ALL
-    ## readOnlyRootFilesystem: true
-    ## runAsNonRoot: true
-    ## runAsUser: 1000
-
-  ingress:
-    # -- defines extra anotations
-    # specifically for the endpoints.inspectServer.service
-    annotations: {}
-
-  service:
-    # -- inspectServer service type
-    type: ClusterIP
-    # -- inspectServer service port
-    port: 5005
-
-  # -- Set inspectServer container resources
-  resources:
-    {}
-    ## limits:
-    ##   cpu: 100m
-    ##   memory: 128Mi
-    ## requests:
-    ##   cpu: 100m
-    ##   memory: 128Mi
-
-  # -- Optionally specify extra list of additional volumeMounts for the endpoints.inspectServer container(s)
-  extraVolumeMounts: []
-
-graphqlServer:
-  # -- Set the graphqlServer docker image
-  image:
-    registry:
-    repository: cartesi/rollups-node
-    tag:
-    digest:
-
-  # -- Number of endpoints replicas to deploy
-  replicaCount: 1
-
-  # -- Node labels for pods assignment
-  nodeSelector: {}
-
-  # -- Tolerations for pods assignment
-  tolerations: []
-
-  # -- Affinity for pods assignment
-  affinity: {}
-
-  # -- Add additional init containers to the endpoints pod(s)
-  ## Example
-  ##
-  ## initContainers:
-  ##   - name: do-something
-  ##     image: busybox
-  ##     command: ['do', 'something']
-  ##
-  initContainers: []
-
-  # -- Set endpoints replicas pod's Security Context
-  podSecurityContext:
-    {}
-    ## fsGroup: 2000
-
-  # -- Annotations for endpoints replicas pods
-  podAnnotations: {}
-
-  # -- Optionally specify extra list of additional volumes for the endpoints pod(s)
-  ##
-  extraVolumes: []
-
-  # -- The RUST_LOG level can be set to trace, debug, info, warn, error, or off.
-  logLevel: info
-
-  healthCheck:
-    # -- enable/disable healthcheck for graphqlServer
-    enabled: true
-    # -- define healthcheck port for graphqlServer
-    port: 8085
-
-  # -- Override default container command (useful when using custom images)
-  command: ["cartesi-rollups-graphql-server"]
-
-  # -- Override default container args (useful when using custom images)
-  args: []
-
-  # -- Extra arguments for graphqlServer
-  extraArgs: []
-
-  # -- Array with extra environment variables to add to endpoints.graphqlServer container
-  ## e.g:
-  ## extraEnvVars:
-  ##   - name: FOO
-  ##     value: "bar"
-  ##
-  extraEnvVars: []
-
-  # -- Name of existing ConfigMap containing extra env vars for graphqlServer container
-  extraEnvVarsCM: ""
-
-  # -- Name of existing Secret containing extra env vars for graphqlServer container
-  extraEnvVarsSecret: ""
-
-  # -- Set graphqlServer container Security Context
-  securityContext:
-    {}
-    ## capabilities:
-    ##   drop:
-    ##   - ALL
-    ## readOnlyRootFilesystem: true
-    ## runAsNonRoot: true
-    ## runAsUser: 1000
-
-  ingress:
-    # -- defines extra anotations
-    # specifically for the endpoints.graphqlServer.service
-    annotations: {}
-
-  service:
-    # -- graphqlServer service type
-    type: ClusterIP
-    # -- graphqlServer service port
-    port: 4000
-
-  # -- Set graphqlServer container resources
+  # -- Set validator Pod resources
   resources:
     {}
     ## limits:
@@ -865,5 +198,5 @@ graphqlServer:
     ##   cpu: 100m
     ##   memory: 128Mi
 
-  # -- Optionally specify extra list of additional volumeMounts for the endpoints.graphqlServer container(s)
+  # -- Optionally specify extra list of additional volumeMounts for the validator Pod(s)
   extraVolumeMounts: []