diff --git a/deployments/compose/compose.yaml b/deployments/compose/compose.yaml
index fbb859836..3e8b21f89 100644
--- a/deployments/compose/compose.yaml
+++ b/deployments/compose/compose.yaml
@@ -69,7 +69,7 @@ services:
       options:
         max-size: 10m
   horusec-messages:
-    image: horuszup/horusec-messages:v2.17.4
+    image: horuszup/horusec-messages:v2.18.0
     ports:
       - "8002:8002"
     depends_on:
@@ -89,7 +89,7 @@ services:
       HORUSEC_SMTP_PORT: "2525"
       HORUSEC_EMAIL_FROM: "horusec@zup.com.br"
   horusec-auth:
-    image: horuszup/horusec-auth:v2.17.4
+    image: horuszup/horusec-auth:v2.18.0
     ports:
       - "8006:8006"
       - "8007:8007"
@@ -131,7 +131,7 @@ services:
       HORUSEC_AUTH_URL: "127.0.0.1:8006"
       HORUSEC_MANAGER_URL: "127.0.0.1:8043"
   horusec-core:
-    image: horuszup/horusec-core:v2.17.4
+    image: horuszup/horusec-core:v2.18.0
     ports:
       - "8003:8003"
     depends_on:
@@ -152,7 +152,7 @@ services:
       HORUSEC_GRPC_AUTH_URL: "horusec-auth:8007"
       HORUSEC_MANAGER_URL: "127.0.0.1:8043"
   horusec-analytic:
-    image: horuszup/horusec-analytic:v2.17.4
+    image: horuszup/horusec-analytic:v2.18.0
     ports:
       - "8005:8005"
     depends_on:
@@ -171,7 +171,7 @@ services:
       HORUSEC_BROKER_USERNAME: "guest" # Sensitive information we not recommended usage in production environment, change for usage strong data for connection with this service
       HORUSEC_BROKER_PASSWORD: "guest" # Sensitive information we not recommended usage in production environment, change for usage strong data for connection with this service
   horusec-api:
-    image: horuszup/horusec-api:v2.17.4
+    image: horuszup/horusec-api:v2.18.0
     ports:
       - "8000:8000"
     depends_on:
@@ -190,7 +190,7 @@ services:
       HORUSEC_BROKER_USERNAME: "guest" # Sensitive information we not recommended usage in production environment, change for usage strong data for connection with this service
       HORUSEC_BROKER_PASSWORD: "guest" # Sensitive information we not recommended usage in production environment, change for usage strong data for connection with this service
   horusec-vulnerability:
-    image: horuszup/horusec-vulnerability:v2.17.4
+    image: horuszup/horusec-vulnerability:v2.18.0
     ports:
       - "8001:8001"
     depends_on:
@@ -208,7 +208,7 @@ services:
       HORUSEC_BROKER_USERNAME: "guest" # Sensitive information we not recommended usage in production environment, change for usage strong data for connection with this service
       HORUSEC_BROKER_PASSWORD: "guest" # Sensitive information we not recommended usage in production environment, change for usage strong data for connection with this service
   horusec-webhook:
-    image: horuszup/horusec-webhook:v2.17.4
+    image: horuszup/horusec-webhook:v2.18.0
     ports:
       - "8004:8004"
     depends_on:
@@ -226,7 +226,7 @@ services:
      HORUSEC_BROKER_USERNAME: "guest"
      HORUSEC_BROKER_PASSWORD: "guest"
   horusec-manager:
-    image: horuszup/horusec-manager:v2.17.4
+    image: horuszup/horusec-manager:v2.18.0
     ports:
       - "8043:8080"
     restart: always
diff --git a/deployments/helm/horusec-platform/README.md b/deployments/helm/horusec-platform/README.md
index 3369c24dd..de3877f0a 100644
--- a/deployments/helm/horusec-platform/README.md
+++ b/deployments/helm/horusec-platform/README.md
@@ -18,7 +18,7 @@ A Helm chart for Kubernetes
 | components.analytic.container.image.pullSecrets | list | `[]` | an optional list of references to secrets in the same namespace to use for pulling any of the images used by Horusec Analytic pod |
 | components.analytic.container.image.registry | string | `"docker.io/horuszup"` | the registry where the repository used to store Horusec Analytic container image is |
 | components.analytic.container.image.repository | string | `"horusec-analytic"` | the repository used to store Horusec Analytic container image |
-| components.analytic.container.image.tag | string | `"v2.17.4"` | the reference to the Horusec Analytic container image version |
+| components.analytic.container.image.tag | string | `"v2.18.0"` | the reference to the Horusec Analytic container image version |
 | components.analytic.container.livenessProbe | string | `nil` |  |
 | components.analytic.container.readinessProbe | string | `nil` |  |
 | components.analytic.container.resources | string | `nil` |  |
@@ -54,7 +54,7 @@ A Helm chart for Kubernetes
 | components.api.container.image.pullSecrets | list | `[]` |  |
 | components.api.container.image.registry | string | `"docker.io/horuszup"` |  |
 | components.api.container.image.repository | string | `"horusec-api"` |  |
-| components.api.container.image.tag | string | `"v2.17.4"` |  |
+| components.api.container.image.tag | string | `"v2.18.0"` |  |
 | components.api.container.livenessProbe | string | `nil` |  |
 | components.api.container.readinessProbe | string | `nil` |  |
 | components.api.container.resources | string | `nil` |  |
@@ -80,7 +80,7 @@ A Helm chart for Kubernetes
 | components.auth.container.image.pullSecrets | list | `[]` |  |
 | components.auth.container.image.registry | string | `"docker.io/horuszup"` |  |
 | components.auth.container.image.repository | string | `"horusec-messages"` |  |
-| components.auth.container.image.tag | string | `"v2.17.4"` |  |
+| components.auth.container.image.tag | string | `"v2.18.0"` |  |
 | components.auth.container.livenessProbe | string | `nil` |  |
 | components.auth.container.readinessProbe | string | `nil` |  |
 | components.auth.container.resources | string | `nil` |  |
@@ -108,7 +108,7 @@ A Helm chart for Kubernetes
 | components.core.container.image.pullSecrets | list | `[]` |  |
 | components.core.container.image.registry | string | `"docker.io/horuszup"` |  |
 | components.core.container.image.repository | string | `"horusec-core"` |  |
-| components.core.container.image.tag | string | `"v2.17.4"` |  |
+| components.core.container.image.tag | string | `"v2.18.0"` |  |
 | components.core.container.livenessProbe | string | `nil` |  |
 | components.core.container.readinessProbe | string | `nil` |  |
 | components.core.container.resources | string | `nil` |  |
@@ -134,7 +134,7 @@ A Helm chart for Kubernetes
 | components.manager.container.image.pullSecrets | list | `[]` |  |
 | components.manager.container.image.registry | string | `"docker.io/horuszup"` |  |
 | components.manager.container.image.repository | string | `"horusec-messages"` |  |
-| components.manager.container.image.tag | string | `"v2.17.4"` |  |
+| components.manager.container.image.tag | string | `"v2.18.0"` |  |
 | components.manager.container.livenessProbe | string | `nil` |  |
 | components.manager.container.readinessProbe | string | `nil` |  |
 | components.manager.container.resources | string | `nil` |  |
@@ -160,7 +160,7 @@ A Helm chart for Kubernetes
 | components.messages.container.image.pullSecrets | list | `[]` |  |
 | components.messages.container.image.registry | string | `"docker.io/horuszup"` |  |
 | components.messages.container.image.repository | string | `"horusec-messages"` |  |
-| components.messages.container.image.tag | string | `"v2.17.4"` |  |
+| components.messages.container.image.tag | string | `"v2.18.0"` |  |
 | components.messages.container.livenessProbe | string | `nil` |  |
 | components.messages.container.readinessProbe | string | `nil` |  |
 | components.messages.container.resources | string | `nil` |  |
@@ -193,7 +193,7 @@ A Helm chart for Kubernetes
 | components.vulnerability.container.image.pullSecrets | list | `[]` |  |
 | components.vulnerability.container.image.registry | string | `"docker.io/horuszup"` |  |
 | components.vulnerability.container.image.repository | string | `"horusec-vulnerability"` |  |
-| components.vulnerability.container.image.tag | string | `"v2.17.4"` |  |
+| components.vulnerability.container.image.tag | string | `"v2.18.0"` |  |
 | components.vulnerability.container.livenessProbe | string | `nil` |  |
 | components.vulnerability.container.readinessProbe | string | `nil` |  |
 | components.vulnerability.container.resources | string | `nil` |  |
@@ -219,7 +219,7 @@ A Helm chart for Kubernetes
 | components.webhook.container.image.pullSecrets | list | `[]` |  |
 | components.webhook.container.image.registry | string | `"docker.io/horuszup"` |  |
 | components.webhook.container.image.repository | string | `"horusec-webhook"` |  |
-| components.webhook.container.image.tag | string | `"v2.17.4"` |  |
+| components.webhook.container.image.tag | string | `"v2.18.0"` |  |
 | components.webhook.container.livenessProbe | string | `nil` |  |
 | components.webhook.container.readinessProbe | string | `nil` |  |
 | components.webhook.container.resources | string | `nil` |  |
diff --git a/deployments/helm/horusec-platform/values.yaml b/deployments/helm/horusec-platform/values.yaml
index 74cbb2472..2ce04a51e 100644
--- a/deployments/helm/horusec-platform/values.yaml
+++ b/deployments/helm/horusec-platform/values.yaml
@@ -25,7 +25,7 @@ components:
         # -- the repository used to store Horusec Analytic container image
         repository: horusec-analytic
         # -- the reference to the Horusec Analytic container image version
-        tag: v2.17.4
+        tag: v2.18.0
       livenessProbe: null
       readinessProbe: null
       resources: null
@@ -42,7 +42,7 @@ components:
           pullSecrets: [ ]
           registry: docker.io/horuszup
           repository: horusec-migrations
-          tag: v2.17.4
+          tag: v2.18.0
       name: analytic_db
       password:
         secretKeyRef:
@@ -82,7 +82,7 @@ components:
         pullSecrets: [ ]
         registry: docker.io/horuszup
         repository: horusec-api
-        tag: v2.17.4
+        tag: v2.18.0
       livenessProbe: null
       readinessProbe: null
       resources: null
@@ -118,7 +118,7 @@ components:
         pullSecrets: [ ]
         registry: docker.io/horuszup
         repository: horusec-auth
-        tag: v2.17.4
+        tag: v2.18.0
       livenessProbe: null
       readinessProbe: null
       resources: null
@@ -156,7 +156,7 @@ components:
         pullSecrets: [ ]
         registry: docker.io/horuszup
         repository: horusec-core
-        tag: v2.17.4
+        tag: v2.18.0
       livenessProbe: null
       readinessProbe: null
       resources: null
@@ -192,7 +192,7 @@ components:
         pullSecrets: [ ]
         registry: docker.io/horuszup
         repository: horusec-manager
-        tag: v2.17.4
+        tag: v2.18.0
       livenessProbe: null
       readinessProbe: null
       resources: null
@@ -228,7 +228,7 @@ components:
         pullSecrets: [ ]
         registry: docker.io/horuszup
         repository: horusec-messages
-        tag: v2.17.4
+        tag: v2.18.0
       livenessProbe: null
       readinessProbe: null
       resources: null
@@ -277,7 +277,7 @@ components:
         pullSecrets: [ ]
         registry: docker.io/horuszup
         repository: horusec-vulnerability
-        tag: v2.17.4
+        tag: v2.18.0
       livenessProbe: null
       readinessProbe: null
       resources: null
@@ -313,7 +313,7 @@ components:
         pullSecrets: [ ]
         registry: docker.io/horuszup
         repository: horusec-webhook
-        tag: v2.17.4
+        tag: v2.18.0
       livenessProbe: null
       readinessProbe: null
       resources: null
@@ -371,7 +371,7 @@ global:
         pullSecrets: [ ]
         registry: docker.io/horuszup
         repository: horusec-migrations
-        tag: v2.17.4
+        tag: v2.18.0
     name: horusec_db
     password:
       secretKeyRef:
diff --git a/manager/deployments/helm/horusec-manager/values.yaml b/manager/deployments/helm/horusec-manager/values.yaml
index a5532ec37..36099eddb 100644
--- a/manager/deployments/helm/horusec-manager/values.yaml
+++ b/manager/deployments/helm/horusec-manager/values.yaml
@@ -18,7 +18,7 @@ image:
   repository: horuszup/horusec-manager
   pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
-  tag: v2.17.4
+  tag: v2.18.0
 
 imagePullSecrets: []
 nameOverride: ""
diff --git a/manager/package.json b/manager/package.json
index bafd87772..2214f2f84 100644
--- a/manager/package.json
+++ b/manager/package.json
@@ -9,7 +9,7 @@
   "bugs": {
     "url": "https://forum.zup.com.br/c/en/horusec"
   },
-  "version": "v2.17.4",
+  "version": "v2.18.0",
   "private": true,
   "dependencies": {
     "@date-io/date-fns": "1.3.13",