diff --git a/components/operator/helm/Chart.yaml b/components/operator/helm/Chart.yaml
index fa3f6d4856..e355fe4512 100644
--- a/components/operator/helm/Chart.yaml
+++ b/components/operator/helm/Chart.yaml
@@ -14,10 +14,10 @@ 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: v2.0.0-rc.17
+version: v2.0.0-rc.18
 
 # 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
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: v2.0.0-rc.17
+appVersion: v2.0.0-rc.18
diff --git a/components/operator/helm/values.yaml b/components/operator/helm/values.yaml
index 3df041b911..b746303045 100644
--- a/components/operator/helm/values.yaml
+++ b/components/operator/helm/values.yaml
@@ -8,7 +8,7 @@ image:
   repository: ghcr.io/formancehq/operator
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  tag: v2.0.0-rc.17
+  tag: v2.0.0-rc.18
 
 
 imagePullSecrets: []
diff --git a/docker-compose.yml b/docker-compose.yml
index f5a5caf093..b4466a89a6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,7 +11,7 @@ services:
       - ".local/gateway/Caddyfile:/etc/caddy/Caddyfile"
 
   ledger:
-    image: "ghcr.io/formancehq/ledger:v2.0.0-rc.17"
+    image: "ghcr.io/formancehq/ledger:v2.0.0-rc.18"
     healthcheck:
       test: [ "CMD", "wget", "http://127.0.0.1:8080/_info", "-O", "-", "-q" ]
       interval: 10s
@@ -24,7 +24,7 @@ services:
       POSTGRES_URI: "postgresql://formance:formance@postgres:${FORMANCE_POSTGRES_PORT:-5432}/ledger?sslmode=disable"
 
   payments-migrate:
-    image: "ghcr.io/formancehq/payments:v2.0.0-rc.17"
+    image: "ghcr.io/formancehq/payments:v2.0.0-rc.18"
     command: migrate up
     depends_on:
       postgres:
@@ -33,7 +33,7 @@ services:
       POSTGRES_URI: "postgres://formance:formance@postgres:${FORMANCE_POSTGRES_PORT:-5432}/payments?sslmode=disable"
 
   payments-api:
-    image: "ghcr.io/formancehq/payments:v2.0.0-rc.17"
+    image: "ghcr.io/formancehq/payments:v2.0.0-rc.18"
     command: api server
     healthcheck:
       test: [ "CMD", "curl", "-f", "http://127.0.0.1:8080/_healthcheck" ]
@@ -51,7 +51,7 @@ services:
       CONFIG_ENCRYPTION_KEY: mysuperencryptionkey
 
   payments-connectors:
-    image: "ghcr.io/formancehq/payments:v2.0.0-rc.17"
+    image: "ghcr.io/formancehq/payments:v2.0.0-rc.18"
     command: connectors server
     healthcheck:
       test: [ "CMD", "curl", "-f", "http://127.0.0.1:8080/_healthcheck" ]
diff --git a/ee/agent/helm/Chart.yaml b/ee/agent/helm/Chart.yaml
index ebd6fdca76..448daa1516 100644
--- a/ee/agent/helm/Chart.yaml
+++ b/ee/agent/helm/Chart.yaml
@@ -10,5 +10,5 @@ maintainers:
 icon: "https://avatars.githubusercontent.com/u/84325077?s=200&v=4"
 
 type: application
-version: v2.0.0-rc.17
-appVersion: v2.0.0-rc.17
+version: v2.0.0-rc.18
+appVersion: v2.0.0-rc.18
diff --git a/ee/agent/helm/values.yaml b/ee/agent/helm/values.yaml
index 815496156c..98f0167cec 100644
--- a/ee/agent/helm/values.yaml
+++ b/ee/agent/helm/values.yaml
@@ -5,7 +5,7 @@ image:
   repository: ghcr.io/formancehq/agent
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  tag: v2.0.0-rc.17
+  tag: v2.0.0-rc.18
 
 imagePullSecrets: []
 nameOverride: ""
diff --git a/helm/regions/Chart.lock b/helm/regions/Chart.lock
index 98dcd9bef4..6be77a128a 100644
--- a/helm/regions/Chart.lock
+++ b/helm/regions/Chart.lock
@@ -1,9 +1,9 @@
 dependencies:
 - name: agent
   repository: file://../../ee/agent/helm
-  version: v2.0.0-rc.17
+  version: v2.0.0-rc.18
 - name: operator
   repository: file://../../components/operator/helm
-  version: v2.0.0-rc.17
-digest: sha256:386d549da3d437ab9d13b7cb40a1c548d5a135e60776196faa069eb44793ed49
-generated: "2024-03-21T09:50:10.26746406Z"
+  version: v2.0.0-rc.18
+digest: sha256:768a7dc54e3e3ca5cb52b6c3e2113715850ea315a60777fa684f302335cdc187
+generated: "2024-03-21T14:11:38.472173564Z"
diff --git a/helm/regions/Chart.yaml b/helm/regions/Chart.yaml
index f00f3773f8..53bcc7a7c8 100644
--- a/helm/regions/Chart.yaml
+++ b/helm/regions/Chart.yaml
@@ -10,15 +10,15 @@ maintainers:
 icon: "https://avatars.githubusercontent.com/u/84325077?s=200&v=4"
 
 type: application
-version: v2.0.0-rc.17
+version: v2.0.0-rc.18
 appVersion: "latest"
 
 dependencies:
   - name: agent
-    version: v2.0.0-rc.17
+    version: v2.0.0-rc.18
     repository: "file://../../ee/agent/helm"
     condition: agent.enabled
   - name: operator
-    version: v2.0.0-rc.17
+    version: v2.0.0-rc.18
     repository: "file://../../components/operator/helm"
     condition: operator.enabled
\ No newline at end of file
diff --git a/helm/regions/templates/versions/default.yaml b/helm/regions/templates/versions/default.yaml
index 23ebdfcec2..65264e11b9 100644
--- a/helm/regions/templates/versions/default.yaml
+++ b/helm/regions/templates/versions/default.yaml
@@ -9,10 +9,10 @@ spec:
   search: v0.10.0
   auth: v0.4.4
   wallets: v0.4.6
-  webhooks: v2.0.0-rc.17
+  webhooks: v2.0.0-rc.18
   payments: v1.0.0-rc.5
   stargate: v0.1.10
-  gateway: v2.0.0-rc.17
+  gateway: v2.0.0-rc.18
   ledger: v1.10.14
-  operator-utils: v2.0.0-rc.17
+  operator-utils: v2.0.0-rc.18
 {{ end }}
diff --git a/helm/regions/templates/versions/v1.0.yaml b/helm/regions/templates/versions/v1.0.yaml
index a7f6ecd08d..ba018df9ef 100644
--- a/helm/regions/templates/versions/v1.0.yaml
+++ b/helm/regions/templates/versions/v1.0.yaml
@@ -9,10 +9,10 @@ spec:
   search: v0.10.0
   auth: v0.4.4
   wallets: v0.4.6
-  webhooks: v2.0.0-rc.17
+  webhooks: v2.0.0-rc.18
   payments: v1.0.0-rc.5
   stargate: v0.1.10
-  gateway: v2.0.0-rc.17
+  gateway: v2.0.0-rc.18
   ledger: v1.10.14
-  operator-utils: v2.0.0-rc.17
+  operator-utils: v2.0.0-rc.18
 {{ end }}
diff --git a/helm/regions/templates/versions/v2.0.yaml b/helm/regions/templates/versions/v2.0.yaml
index 55958577be..b12e389322 100644
--- a/helm/regions/templates/versions/v2.0.yaml
+++ b/helm/regions/templates/versions/v2.0.yaml
@@ -4,15 +4,15 @@ kind: Versions
 metadata:
   name: v2.0
 spec:
-  ledger: v2.0.0-rc.17
-  search: v2.0.0-rc.17
-  stargate: v2.0.0-rc.17
-  auth: v2.0.0-rc.17
-  wallets: v2.0.0-rc.17
-  webhooks: v2.0.0-rc.17
-  gateway: v2.0.0-rc.17
-  payments: v2.0.0-rc.17
-  orchestration: v2.0.0-rc.17
-  reconciliation: v2.0.0-rc.17
-  operator-utils: v2.0.0-rc.17
+  ledger: v2.0.0-rc.18
+  search: v2.0.0-rc.18
+  stargate: v2.0.0-rc.18
+  auth: v2.0.0-rc.18
+  wallets: v2.0.0-rc.18
+  webhooks: v2.0.0-rc.18
+  gateway: v2.0.0-rc.18
+  payments: v2.0.0-rc.18
+  orchestration: v2.0.0-rc.18
+  reconciliation: v2.0.0-rc.18
+  operator-utils: v2.0.0-rc.18
 {{ end }}
diff --git a/helm/regions/values.yaml b/helm/regions/values.yaml
index b6d33df928..db8274904b 100644
--- a/helm/regions/values.yaml
+++ b/helm/regions/values.yaml
@@ -4,7 +4,7 @@ operator:
   nameOverride: "operator"
   image:
     repository: "ghcr.io/formancehq/operator"
-    tag: "v2.0.0-rc.17"
+    tag: "v2.0.0-rc.18"
   operator:
     disableWebhooks: false
     region: "private"
@@ -15,7 +15,7 @@ operator:
 agent:
   enabled: false
   image:
-    tag: "v2.0.0-rc.17"
+    tag: "v2.0.0-rc.18"
   server:
     address: "app.formance.cloud:443"
     tls: