diff --git a/charts/infrahub-enterprise/values.yaml b/charts/infrahub-enterprise/values.yaml
index 337cc71..7005eff 100644
--- a/charts/infrahub-enterprise/values.yaml
+++ b/charts/infrahub-enterprise/values.yaml
@@ -30,6 +30,7 @@ infrahub:
         INFRAHUB_LOG_LEVEL: INFO
         INFRAHUB_PRODUCTION: "false"
         INFRAHUB_INITIAL_ADMIN_TOKEN: 06438eb2-8019-4776-878c-0941b1f1d1ec
+        INFRAHUB_INITIAL_AGENT_TOKEN: 44af444d-3b26-410d-9546-b758657e026c
         INFRAHUB_SECURITY_SECRET_KEY: 327f747f-efac-42be-9e73-999f08f86b92
         INFRAHUB_GIT_REPOSITORIES_DIRECTORY: "/opt/infrahub/git"
         INFRAHUB_WORKFLOW_ADDRESS: prefect-server
diff --git a/charts/infrahub/README.md b/charts/infrahub/README.md
index 913795b..bf01d6a 100644
--- a/charts/infrahub/README.md
+++ b/charts/infrahub/README.md
@@ -124,7 +124,7 @@ The chart offers the ability to configure persistence for the database and other
 | infrahubServer.gatewayApi.httpRoute.parentRefs | list | `[]` | Parent Gateway references |
 | infrahubServer.gatewayApi.httpRoute.path | string | `"/"` | Path prefix for the default matching rule |
 | infrahubServer.infrahubServer.args | list | `["gunicorn","--config","/source/backend/infrahub/serve/gunicorn_config.py","-w","2","--logger-class","infrahub.serve.log.GunicornLogger","infrahub.server:app"]` | Container arguments for the API server |
-| infrahubServer.infrahubServer.env | object | `{"INFRAHUB_ALLOW_ANONYMOUS_ACCESS":"true","INFRAHUB_CACHE_PORT":6379,"INFRAHUB_DB_TYPE":"neo4j","INFRAHUB_GIT_REPOSITORIES_DIRECTORY":"/opt/infrahub/git","INFRAHUB_INITIAL_ADMIN_TOKEN":"06438eb2-8019-4776-878c-0941b1f1d1ec","INFRAHUB_LOG_LEVEL":"INFO","INFRAHUB_PRODUCTION":"false","INFRAHUB_SECURITY_SECRET_KEY":"327f747f-efac-42be-9e73-999f08f86b92","INFRAHUB_WORKFLOW_ADDRESS":"prefect-server","INFRAHUB_WORKFLOW_PORT":4200,"PREFECT_API_URL":"http://prefect-server:4200/api"}` | Container environment for the API server |
+| infrahubServer.infrahubServer.env | object | `{"INFRAHUB_ALLOW_ANONYMOUS_ACCESS":"true","INFRAHUB_CACHE_PORT":6379,"INFRAHUB_DB_TYPE":"neo4j","INFRAHUB_GIT_REPOSITORIES_DIRECTORY":"/opt/infrahub/git","INFRAHUB_INITIAL_ADMIN_TOKEN":"06438eb2-8019-4776-878c-0941b1f1d1ec","INFRAHUB_INITIAL_AGENT_TOKEN":"44af444d-3b26-410d-9546-b758657e026c","INFRAHUB_LOG_LEVEL":"INFO","INFRAHUB_PRODUCTION":"false","INFRAHUB_SECURITY_SECRET_KEY":"327f747f-efac-42be-9e73-999f08f86b92","INFRAHUB_WORKFLOW_ADDRESS":"prefect-server","INFRAHUB_WORKFLOW_PORT":4200,"PREFECT_API_URL":"http://prefect-server:4200/api"}` | Container environment for the API server |
 | infrahubServer.infrahubServer.envFromExistingSecret | DEPRECATED | `""` | Name of an existing secret to use for environment variables. Use envFromExistingSecrets instead. @deprecated Use envFromExistingSecrets instead |
 | infrahubServer.infrahubServer.envFromExistingSecrets | list | `[]` | List of existing secrets to use for environment variables |
 | infrahubServer.infrahubServer.extraVolumeMounts | list | `[]` | Extra volumeMounts for the server pod |
@@ -156,7 +156,7 @@ The chart offers the ability to configure persistence for the database and other
 | infrahubServer.type | string | `""` | @deprecated Use `infrahubServer.service.type` instead. This field will be removed in a future release. |
 | infrahubTaskWorker.affinity | object | `{}` | Affinity for the task worker pods |
 | infrahubTaskWorker.infrahubTaskWorker.args | list | `["prefect","worker","start","--type","infrahubasync","--pool","infrahub-worker","--with-healthcheck"]` | Container arguments for the task worker |
-| infrahubTaskWorker.infrahubTaskWorker.env | object | `{"INFRAHUB_API_TOKEN":"06438eb2-8019-4776-878c-0941b1f1d1ec","INFRAHUB_CACHE_PORT":6379,"INFRAHUB_DB_TYPE":"neo4j","INFRAHUB_GIT_REPOSITORIES_DIRECTORY":"/opt/infrahub/git","INFRAHUB_LOG_LEVEL":"DEBUG","INFRAHUB_PRODUCTION":"false","INFRAHUB_TIMEOUT":"60","INFRAHUB_WORKFLOW_ADDRESS":"prefect-server","INFRAHUB_WORKFLOW_PORT":4200,"PREFECT_AGENT_QUERY_INTERVAL":3,"PREFECT_API_URL":"http://prefect-server:4200/api","PREFECT_WORKER_QUERY_SECONDS":3}` | Container environment for the task worker |
+| infrahubTaskWorker.infrahubTaskWorker.env | object | `{"INFRAHUB_API_TOKEN":"06438eb2-8019-4776-878c-0941b1f1d1ec","INFRAHUB_CACHE_PORT":6379,"INFRAHUB_DB_TYPE":"neo4j","INFRAHUB_GIT_REPOSITORIES_DIRECTORY":"/opt/infrahub/git","INFRAHUB_INITIAL_AGENT_TOKEN":"44af444d-3b26-410d-9546-b758657e026c","INFRAHUB_LOG_LEVEL":"DEBUG","INFRAHUB_PRODUCTION":"false","INFRAHUB_TIMEOUT":"60","INFRAHUB_WORKFLOW_ADDRESS":"prefect-server","INFRAHUB_WORKFLOW_PORT":4200,"PREFECT_AGENT_QUERY_INTERVAL":3,"PREFECT_API_URL":"http://prefect-server:4200/api","PREFECT_WORKER_QUERY_SECONDS":3}` | Container environment for the task worker |
 | infrahubTaskWorker.infrahubTaskWorker.envFromExistingSecret | DEPRECATED | `""` | Name of an existing secret to use for environment variables. Use envFromExistingSecrets instead. @deprecated Use envFromExistingSecrets instead |
 | infrahubTaskWorker.infrahubTaskWorker.envFromExistingSecrets | list | `[]` | List of existing secrets to use for environment variables |
 | infrahubTaskWorker.infrahubTaskWorker.extraVolumeMounts | list | `[]` | Extra volumeMounts for the task worker pod |
@@ -197,7 +197,7 @@ The chart offers the ability to configure persistence for the database and other
 | neo4j.volumes.data.mode | string | `"volume"` |  |
 | neo4j.volumes.data.volume.emptyDir | object | `{}` |  |
 | prefect-server.enabled | bool | `true` |  |
-| prefect-server.global.prefect.image.prefectTag | string | `"1.8.2"` |  |
+| prefect-server.global.prefect.image.prefectTag | string | `"1.8.4"` |  |
 | prefect-server.global.prefect.image.repository | string | `"registry.opsmill.io/opsmill/infrahub"` |  |
 | prefect-server.postgresql.enabled | bool | `true` |  |
 | prefect-server.postgresql.image.repository | string | `"bitnamilegacy/postgresql"` |  |
@@ -234,6 +234,7 @@ The chart offers the ability to configure persistence for the database and other
 | redis.image.tag | string | `"8.2.1-debian-12-r0"` |  |
 | redis.master.persistence.enabled | bool | `false` |  |
 | redis.master.podLabels.infrahub/service | string | `"cache"` |  |
+| redis.master.resourcesPreset | string | `"medium"` |  |
 | redis.master.service.ports.redis | int | `6379` |  |
 | redis.nameOverride | string | `"cache"` |  |
 | upgrade.enabled | bool | `false` | Whether to run infrahub upgrade as a post-install/pre-upgrade hook job |
diff --git a/charts/infrahub/templates/infrahub-demo-data-job.yaml b/charts/infrahub/templates/infrahub-demo-data-job.yaml
index 57a8f9b..b3a1034 100644
--- a/charts/infrahub/templates/infrahub-demo-data-job.yaml
+++ b/charts/infrahub/templates/infrahub-demo-data-job.yaml
@@ -38,7 +38,7 @@ spec:
           {{- include "infrahub-helm.infrahubDemoData.defaultEnv" . | nindent 12 }}
           {{- with .Values.infrahubDemoData.env }}
             {{- range $key, $value := . }}
-            {{- if or $value (not (or (eq $key "INFRAHUB_INITIAL_ADMIN_TOKEN") (eq $key "INFRAHUB_SECURITY_SECRET_KEY") (eq $key "INFRAHUB_API_TOKEN"))) }}
+            {{- if or $value (not (or (eq $key "INFRAHUB_INITIAL_ADMIN_TOKEN") (eq $key "INFRAHUB_INITIAL_AGENT_TOKEN") (eq $key "INFRAHUB_SECURITY_SECRET_KEY") (eq $key "INFRAHUB_API_TOKEN"))) }}
             - name: {{ $key }}
               value: {{ $value | quote }}
             {{- end }}
diff --git a/charts/infrahub/templates/infrahub-server.yaml b/charts/infrahub/templates/infrahub-server.yaml
index 6cfcdc4..67771cc 100644
--- a/charts/infrahub/templates/infrahub-server.yaml
+++ b/charts/infrahub/templates/infrahub-server.yaml
@@ -60,7 +60,7 @@ spec:
           env:
             {{- include "infrahub-helm.infrahubServer.defaultEnv" . | nindent 12 }}
             {{- range $key, $value := .Values.infrahubServer.infrahubServer.env }}
-            {{- if or $value (not (or (eq $key "INFRAHUB_INITIAL_ADMIN_TOKEN") (eq $key "INFRAHUB_SECURITY_SECRET_KEY") (eq $key "INFRAHUB_API_TOKEN"))) }}
+            {{- if or $value (not (or (eq $key "INFRAHUB_INITIAL_ADMIN_TOKEN") (eq $key "INFRAHUB_INITIAL_AGENT_TOKEN") (eq $key "INFRAHUB_SECURITY_SECRET_KEY") (eq $key "INFRAHUB_API_TOKEN"))) }}
             - name: {{ $key }}
               value: {{ $value | quote }}
             {{- end }}
diff --git a/charts/infrahub/templates/infrahub-task-worker.yaml b/charts/infrahub/templates/infrahub-task-worker.yaml
index 4411577..ceaff53 100644
--- a/charts/infrahub/templates/infrahub-task-worker.yaml
+++ b/charts/infrahub/templates/infrahub-task-worker.yaml
@@ -61,7 +61,7 @@ spec:
           env:
             {{- include "infrahub-helm.infrahubTaskWorker.defaultEnv" . | nindent 12 }}
             {{- range $key, $value := .Values.infrahubTaskWorker.infrahubTaskWorker.env }}
-            {{- if or $value (not (or (eq $key "INFRAHUB_INITIAL_ADMIN_TOKEN") (eq $key "INFRAHUB_SECURITY_SECRET_KEY") (eq $key "INFRAHUB_API_TOKEN"))) }}
+            {{- if or $value (not (or (eq $key "INFRAHUB_INITIAL_ADMIN_TOKEN") (eq $key "INFRAHUB_INITIAL_AGENT_TOKEN") (eq $key "INFRAHUB_SECURITY_SECRET_KEY") (eq $key "INFRAHUB_API_TOKEN"))) }}
             - name: {{ $key }}
               value: {{ $value | quote }}
             {{- end }}
diff --git a/charts/infrahub/templates/infrahub-upgrade-job.yaml b/charts/infrahub/templates/infrahub-upgrade-job.yaml
index 2cf9aa0..352a29a 100644
--- a/charts/infrahub/templates/infrahub-upgrade-job.yaml
+++ b/charts/infrahub/templates/infrahub-upgrade-job.yaml
@@ -53,7 +53,7 @@ spec:
           env:
             {{- include "infrahub-helm.infrahubServer.defaultEnv" . | nindent 12 }}
             {{- range $key, $value := .Values.infrahubServer.infrahubServer.env }}
-            {{- if or $value (not (or (eq $key "INFRAHUB_INITIAL_ADMIN_TOKEN") (eq $key "INFRAHUB_SECURITY_SECRET_KEY") (eq $key "INFRAHUB_API_TOKEN"))) }}
+            {{- if or $value (not (or (eq $key "INFRAHUB_INITIAL_ADMIN_TOKEN") (eq $key "INFRAHUB_INITIAL_AGENT_TOKEN") (eq $key "INFRAHUB_SECURITY_SECRET_KEY") (eq $key "INFRAHUB_API_TOKEN"))) }}
             - name: {{ $key }}
               value: {{ $value | quote }}
             {{- end }}
diff --git a/charts/infrahub/values.yaml b/charts/infrahub/values.yaml
index ea92072..4b72e13 100644
--- a/charts/infrahub/values.yaml
+++ b/charts/infrahub/values.yaml
@@ -117,6 +117,7 @@ infrahubTaskWorker:
       INFRAHUB_LOG_LEVEL: DEBUG
       INFRAHUB_PRODUCTION: "false"
       INFRAHUB_API_TOKEN: 06438eb2-8019-4776-878c-0941b1f1d1ec
+      INFRAHUB_INITIAL_AGENT_TOKEN: 44af444d-3b26-410d-9546-b758657e026c
       INFRAHUB_TIMEOUT: "60"
       INFRAHUB_GIT_REPOSITORIES_DIRECTORY: "/opt/infrahub/git"
       INFRAHUB_WORKFLOW_ADDRESS: prefect-server
@@ -251,6 +252,7 @@ infrahubServer:
       INFRAHUB_LOG_LEVEL: INFO
       INFRAHUB_PRODUCTION: "false"
       INFRAHUB_INITIAL_ADMIN_TOKEN: 06438eb2-8019-4776-878c-0941b1f1d1ec
+      INFRAHUB_INITIAL_AGENT_TOKEN: 44af444d-3b26-410d-9546-b758657e026c
       INFRAHUB_SECURITY_SECRET_KEY: 327f747f-efac-42be-9e73-999f08f86b92
       INFRAHUB_GIT_REPOSITORIES_DIRECTORY: "/opt/infrahub/git"
       INFRAHUB_WORKFLOW_ADDRESS: prefect-server