diff --git a/charts/graph-network-indexer/Chart.yaml b/charts/graph-network-indexer/Chart.yaml
index 6bb7c673..585bf89c 100644
--- a/charts/graph-network-indexer/Chart.yaml
+++ b/charts/graph-network-indexer/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.6.3
+version: 0.6.4
 
 # The appVersion field is intentionally left empty. Component versions are managed separately
 # and can be found in the values.yaml file or individual component configurations.
diff --git a/charts/graph-network-indexer/README.md b/charts/graph-network-indexer/README.md
index 0c333cbb..8a9b91e5 100644
--- a/charts/graph-network-indexer/README.md
+++ b/charts/graph-network-indexer/README.md
@@ -2,7 +2,7 @@
 
 Deploy and scale the [Graph Network Indexer](https://github.com/graphprotocol/indexer) components inside Kubernetes with ease
 
-[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) ![Version: 0.6.3](https://img.shields.io/badge/Version-0.6.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) ![Version: 0.6.4](https://img.shields.io/badge/Version-0.6.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 ## Introduction
 
@@ -112,7 +112,7 @@ We do not recommend that you upgrade the application by overriding `image.tag`.
  | indexerAgent.config.max-provision-initial-size | Setting for automated initial provision for Horizon migration | int | `100000` |
  | indexerAgent.env |  | object | `{}` |
  | indexerAgent.extraArgs |  | list | `[]` |
- | indexerAgent.image | Image for indexer-agent | object | `{"pullPolicy":"IfNotPresent","repository":"ghcr.io/graphprotocol/indexer-agent","tag":"v0.25.3"}` |
+ | indexerAgent.image | Image for indexer-agent | object | `{"pullPolicy":"IfNotPresent","repository":"ghcr.io/graphprotocol/indexer-agent","tag":"v0.25.5"}` |
  | indexerAgent.nodeSelector |  | object | `{}` |
  | indexerAgent.podAnnotations | Annotations for the `Pod` | object | `{}` |
  | indexerAgent.podSecurityContext | Pod-wide security context | object | `{"fsGroup":101337,"runAsGroup":101337,"runAsNonRoot":true,"runAsUser":101337}` |
diff --git a/charts/graph-network-indexer/templates/dashboards.yaml b/charts/graph-network-indexer/templates/dashboards.yaml
index eeae6af0..b1b3698a 100644
--- a/charts/graph-network-indexer/templates/dashboards.yaml
+++ b/charts/graph-network-indexer/templates/dashboards.yaml
@@ -4,6 +4,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "graph-network-indexer.fullname" . }}-dashboards
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "graph-network-indexer.labels" . | nindent 4 }}
     {{ $values.dashboardsConfigMapLabel }}: {{ $values.dashboardsConfigMapLabelValue | quote }}
diff --git a/charts/graph-network-indexer/templates/indexer-agent/service.yaml b/charts/graph-network-indexer/templates/indexer-agent/service.yaml
index 517600b8..5db40652 100644
--- a/charts/graph-network-indexer/templates/indexer-agent/service.yaml
+++ b/charts/graph-network-indexer/templates/indexer-agent/service.yaml
@@ -5,6 +5,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "graph-network-indexer.fullname" . }}-{{ $componentName }}-headless
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "graph-network-indexer.labels" . | nindent 4 }}
     {{- $componentLabel | nindent 4 }}
@@ -25,6 +26,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "graph-network-indexer.fullname" . }}-{{ $componentName }}
+  namespace: {{ .Release.Namespace }}
   {{- if $values.service.topologyAwareRouting.enabled }}
   annotations:
     service.kubernetes.io/topology-aware-hints: "auto"
diff --git a/charts/graph-network-indexer/templates/indexer-agent/servicemonitor.yaml b/charts/graph-network-indexer/templates/indexer-agent/servicemonitor.yaml
index 1fce09c1..11fe9fcc 100644
--- a/charts/graph-network-indexer/templates/indexer-agent/servicemonitor.yaml
+++ b/charts/graph-network-indexer/templates/indexer-agent/servicemonitor.yaml
@@ -7,6 +7,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ include "graph-network-indexer.fullname" . }}-{{ $componentName }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "graph-network-indexer.labels" . | nindent 4 }}
     {{- $componentLabel | nindent 4 }}
diff --git a/charts/graph-network-indexer/templates/indexer-agent/statefulset.yaml b/charts/graph-network-indexer/templates/indexer-agent/statefulset.yaml
index 6a902d63..3cddef12 100644
--- a/charts/graph-network-indexer/templates/indexer-agent/statefulset.yaml
+++ b/charts/graph-network-indexer/templates/indexer-agent/statefulset.yaml
@@ -46,6 +46,7 @@ apiVersion: apps/v1
 kind: StatefulSet # StatefulSet is better behaved when trying to maintain a single instance of the agent. We never want more than one agent active at a time.
 metadata:
   name: {{ include "graph-network-indexer.fullname" . }}-{{ $componentName }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "graph-network-indexer.labels" . | nindent 4 }}
     {{- $componentLabel | nindent 4 }}
diff --git a/charts/graph-network-indexer/templates/indexer-service/configmap.yaml b/charts/graph-network-indexer/templates/indexer-service/configmap.yaml
index d3944000..fcf62e2c 100644
--- a/charts/graph-network-indexer/templates/indexer-service/configmap.yaml
+++ b/charts/graph-network-indexer/templates/indexer-service/configmap.yaml
@@ -8,6 +8,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "graph-network-indexer.fullname" . }}-{{ $componentName }}-config
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "graph-network-indexer.labels" . | nindent 4 }}
     {{- $componentLabel | nindent 4 }}
diff --git a/charts/graph-network-indexer/templates/indexer-service/deployment.yaml b/charts/graph-network-indexer/templates/indexer-service/deployment.yaml
index fe9231b6..f0b0b201 100644
--- a/charts/graph-network-indexer/templates/indexer-service/deployment.yaml
+++ b/charts/graph-network-indexer/templates/indexer-service/deployment.yaml
@@ -9,6 +9,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "graph-network-indexer.fullname" . }}-{{ $componentName }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "graph-network-indexer.labels" . | nindent 4 }}
     {{- $componentLabel | nindent 4 }}
diff --git a/charts/graph-network-indexer/templates/indexer-service/service.yaml b/charts/graph-network-indexer/templates/indexer-service/service.yaml
index f39496c9..7e8c88df 100644
--- a/charts/graph-network-indexer/templates/indexer-service/service.yaml
+++ b/charts/graph-network-indexer/templates/indexer-service/service.yaml
@@ -9,6 +9,7 @@ metadata:
     service.kubernetes.io/topology-aware-hints: "auto"
   {{- end }}
   name: {{ include "graph-network-indexer.fullname" . }}-{{ $componentName }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "graph-network-indexer.labels" . | nindent 4 }}
     {{- $componentLabel | nindent 4 }}
diff --git a/charts/graph-network-indexer/templates/indexer-service/servicemonitor.yaml b/charts/graph-network-indexer/templates/indexer-service/servicemonitor.yaml
index 4714e4f3..52b437b2 100644
--- a/charts/graph-network-indexer/templates/indexer-service/servicemonitor.yaml
+++ b/charts/graph-network-indexer/templates/indexer-service/servicemonitor.yaml
@@ -7,6 +7,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ include "graph-network-indexer.fullname" . }}-{{ $componentName }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "graph-network-indexer.labels" . | nindent 4 }}
     {{- $componentLabel | nindent 4 }}
diff --git a/charts/graph-network-indexer/templates/indexer-tap-agent/configmap.yaml b/charts/graph-network-indexer/templates/indexer-tap-agent/configmap.yaml
index d6175865..c47a61e4 100644
--- a/charts/graph-network-indexer/templates/indexer-tap-agent/configmap.yaml
+++ b/charts/graph-network-indexer/templates/indexer-tap-agent/configmap.yaml
@@ -8,6 +8,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "graph-network-indexer.fullname" . }}-{{ $componentName }}-config
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "graph-network-indexer.labels" . | nindent 4 }}
     {{- $componentLabel | nindent 4 }}
diff --git a/charts/graph-network-indexer/templates/indexer-tap-agent/service.yaml b/charts/graph-network-indexer/templates/indexer-tap-agent/service.yaml
index 22530cff..03b90ab7 100644
--- a/charts/graph-network-indexer/templates/indexer-tap-agent/service.yaml
+++ b/charts/graph-network-indexer/templates/indexer-tap-agent/service.yaml
@@ -6,6 +6,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "graph-network-indexer.fullname" . }}-{{ $componentName }}-headless
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "graph-network-indexer.labels" . | nindent 4 }}
     {{- $componentLabel | nindent 4 }}
@@ -30,6 +31,7 @@ metadata:
     service.kubernetes.io/topology-aware-hints: "auto"
   {{- end }}
   name: {{ include "graph-network-indexer.fullname" . }}-{{ $componentName }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "graph-network-indexer.labels" . | nindent 4 }}
     {{- $componentLabel | nindent 4 }}
diff --git a/charts/graph-network-indexer/templates/indexer-tap-agent/servicemonitor.yaml b/charts/graph-network-indexer/templates/indexer-tap-agent/servicemonitor.yaml
index 29e767de..d936f879 100644
--- a/charts/graph-network-indexer/templates/indexer-tap-agent/servicemonitor.yaml
+++ b/charts/graph-network-indexer/templates/indexer-tap-agent/servicemonitor.yaml
@@ -7,6 +7,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ include "graph-network-indexer.fullname" . }}-{{ $componentName }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "graph-network-indexer.labels" . | nindent 4 }}
     {{- $componentLabel | nindent 4 }}
diff --git a/charts/graph-network-indexer/templates/indexer-tap-agent/statefulset.yaml b/charts/graph-network-indexer/templates/indexer-tap-agent/statefulset.yaml
index 84a55081..d089cead 100644
--- a/charts/graph-network-indexer/templates/indexer-tap-agent/statefulset.yaml
+++ b/charts/graph-network-indexer/templates/indexer-tap-agent/statefulset.yaml
@@ -11,6 +11,7 @@ apiVersion: apps/v1
 kind: StatefulSet # StatefulSet is better behaved when trying to maintain a single instance of the indexer-tap-agent. We never want more than one indexer-tap-agent active at a time.
 metadata:
   name: {{ include "graph-network-indexer.fullname" . }}-{{ $componentName }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "graph-network-indexer.labels" . | nindent 4 }}
     {{- $componentLabel | nindent 4 }}
diff --git a/charts/graph-network-indexer/templates/serviceaccount.yaml b/charts/graph-network-indexer/templates/serviceaccount.yaml
index 68fdf561..14068a5c 100644
--- a/charts/graph-network-indexer/templates/serviceaccount.yaml
+++ b/charts/graph-network-indexer/templates/serviceaccount.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "graph-network-indexer.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "graph-network-indexer.labels" . | nindent 4 }}
   {{- with .Values.serviceAccount.annotations }}
diff --git a/charts/graph-network-indexer/values.yaml b/charts/graph-network-indexer/values.yaml
index 8409f3d3..c482b77f 100644
--- a/charts/graph-network-indexer/values.yaml
+++ b/charts/graph-network-indexer/values.yaml
@@ -119,7 +119,7 @@ indexerAgent:
   image:
     repository: ghcr.io/graphprotocol/indexer-agent
     pullPolicy: IfNotPresent
-    tag: "v0.25.3"
+    tag: "v0.25.5"
 
   # -- Config to be supplied as CLI arguments, specified using YAML keys to allow overriding
   config:
diff --git a/charts/graph-node/Chart.yaml b/charts/graph-node/Chart.yaml
index 078736bd..4755ebf0 100644
--- a/charts/graph-node/Chart.yaml
+++ b/charts/graph-node/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.6.6
+version: 0.6.7
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/graph-node/README.md b/charts/graph-node/README.md
index b56ac7ad..ccac5e0a 100644
--- a/charts/graph-node/README.md
+++ b/charts/graph-node/README.md
@@ -2,7 +2,7 @@
 
 Deploy and scale [Graph Node](https://github.com/graphprotocol/graph-node) inside Kubernetes with ease
 
-[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) ![Version: 0.6.6](https://img.shields.io/badge/Version-0.6.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.41.1](https://img.shields.io/badge/AppVersion-v0.41.1-informational?style=flat-square)
+[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) ![Version: 0.6.7](https://img.shields.io/badge/Version-0.6.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.41.1](https://img.shields.io/badge/AppVersion-v0.41.1-informational?style=flat-square)
 
 ## Introduction
 
diff --git a/charts/graph-node/templates/dashboards.yaml b/charts/graph-node/templates/dashboards.yaml
index e8e9d7ee..5acf8646 100644
--- a/charts/graph-node/templates/dashboards.yaml
+++ b/charts/graph-node/templates/dashboards.yaml
@@ -4,9 +4,10 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "graph-node.fullname" . }}-dashboards
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "graph-node.labels" . | nindent 4 }}
     {{ $values.dashboardsConfigMapLabel }}: {{ $values.dashboardsConfigMapLabelValue | quote }}
 data:
 {{- (.Files.Glob "dashboards/*").AsConfig | nindent 2 }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/charts/graph-node/templates/graph-node/all.yaml b/charts/graph-node/templates/graph-node/all.yaml
index c29963df..fa43a783 100644
--- a/charts/graph-node/templates/graph-node/all.yaml
+++ b/charts/graph-node/templates/graph-node/all.yaml
@@ -36,6 +36,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "graph-node.fullname" . }}-config
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "graph-node.labels" . | nindent 4 }}
 data:
@@ -57,6 +58,7 @@ apiVersion: apps/v1
 kind: {{ $values.kind }}
 metadata:
   name: {{ include "graph-node.fullname" . }}-{{ $groupName }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "graph-node.labels" . | nindent 4 }}
     {{- $componentLabel | nindent 4 }}
@@ -306,6 +308,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "graph-node.fullname" . }}-{{ $groupName }}-headless
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "graph-node.labels" . | nindent 4 }}
     {{- $componentLabel | nindent 4 }}
@@ -334,6 +337,7 @@ metadata:
     {{- end }}
   {{- end }}
   name: {{ include "graph-node.fullname" . }}-{{ $groupName }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "graph-node.labels" . | nindent 4 }}
     {{- $componentLabel | nindent 4 }}
@@ -358,6 +362,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ include "graph-node.fullname" . }}-{{ $groupName }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "graph-node.labels" . | nindent 4 }}
     {{- $componentLabel | nindent 4 }}
diff --git a/charts/graph-node/templates/rbac.yaml b/charts/graph-node/templates/rbac.yaml
index 6022396d..1e501af7 100644
--- a/charts/graph-node/templates/rbac.yaml
+++ b/charts/graph-node/templates/rbac.yaml
@@ -4,6 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: {{ include "graph-node.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "graph-node.labels" . | nindent 4 }}
 rules:
@@ -13,6 +14,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: {{ include "graph-node.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "graph-node.labels" . | nindent 4 }}
 roleRef:
@@ -22,4 +24,5 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: {{ include "graph-node.serviceAccountName" . }}
+    namespace: {{ .Release.Namespace }}
 {{- end }}
diff --git a/charts/graph-node/templates/serviceaccount.yaml b/charts/graph-node/templates/serviceaccount.yaml
index e0e0188a..e898e077 100644
--- a/charts/graph-node/templates/serviceaccount.yaml
+++ b/charts/graph-node/templates/serviceaccount.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "graph-node.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "graph-node.labels" . | nindent 4 }}
   {{- with .Values.serviceAccount.annotations }}