diff --git a/.stack-version b/.stack-version
index 49467df85..32d2dad06 100644
--- a/.stack-version
+++ b/.stack-version
@@ -1 +1 @@
-7.17.20-23ae4de5-SNAPSHOT
\ No newline at end of file
+7.17.21-5d83bb4d-SNAPSHOT
\ No newline at end of file
diff --git a/internal/common/defaults.go b/internal/common/defaults.go
index 030176418..f497219c9 100644
--- a/internal/common/defaults.go
+++ b/internal/common/defaults.go
@@ -36,7 +36,7 @@ const FleetProfileName = "fleet"
 const FleetServerAgentServiceName = "fleet-server"
 
 // BeatVersionBase is the base version of the Beat to use
-var BeatVersionBase = "7.17.20-23ae4de5-SNAPSHOT"
+var BeatVersionBase = "7.17.21-5d83bb4d-SNAPSHOT"
 
 // BeatVersion is the version of the Beat to use
 // It can be overriden by BEAT_VERSION env var
diff --git a/internal/config/compose/profiles/fleet/docker-compose.yml b/internal/config/compose/profiles/fleet/docker-compose.yml
index fffc950fa..40c00a688 100644
--- a/internal/config/compose/profiles/fleet/docker-compose.yml
+++ b/internal/config/compose/profiles/fleet/docker-compose.yml
@@ -18,7 +18,7 @@ services:
       - xpack.security.authc.token.timeout=60m
       - ELASTIC_USERNAME=admin
       - ELASTIC_PASSWORD=changeme
-    image: "docker.elastic.co/elasticsearch/elasticsearch:${stackVersion:-7.17.20-23ae4de5-SNAPSHOT}"
+    image: "docker.elastic.co/elasticsearch/elasticsearch:${stackVersion:-7.17.21-5d83bb4d-SNAPSHOT}"
     platform: ${stackPlatform:-linux/amd64}
     ports:
       - "9200:9200"
@@ -34,7 +34,7 @@ services:
       test: "curl -f http://localhost:5601/login | grep kbn-injected-metadata 2>&1 >/dev/null"
       retries: 600
       interval: 1s
-    image: "docker.elastic.co/${kibanaDockerNamespace:-kibana}/kibana:${kibanaVersion:-7.17.20-23ae4de5-SNAPSHOT}"
+    image: "docker.elastic.co/${kibanaDockerNamespace:-kibana}/kibana:${kibanaVersion:-7.17.21-5d83bb4d-SNAPSHOT}"
     platform: ${stackPlatform:-linux/amd64}
     ports:
       - "5601:5601"
diff --git a/internal/config/compose/services/elastic-agent/cloud/docker-compose.yml b/internal/config/compose/services/elastic-agent/cloud/docker-compose.yml
index 6380d7b6b..69f3953c9 100644
--- a/internal/config/compose/services/elastic-agent/cloud/docker-compose.yml
+++ b/internal/config/compose/services/elastic-agent/cloud/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '2.4'
 services:
   elastic-agent:
-    image: "docker.elastic.co/${elasticAgentDockerNamespace:-beats}/elastic-agent${elasticAgentDockerImageSuffix}:${elasticAgentTag:-7.17.20-23ae4de5-SNAPSHOT}"
+    image: "docker.elastic.co/${elasticAgentDockerNamespace:-beats}/elastic-agent${elasticAgentDockerImageSuffix}:${elasticAgentTag:-7.17.21-5d83bb4d-SNAPSHOT}"
     depends_on:
       elasticsearch:
         condition: service_healthy
diff --git a/internal/config/compose/services/elastic-agent/docker-compose.yml b/internal/config/compose/services/elastic-agent/docker-compose.yml
index 7eb5f14f4..719635e65 100644
--- a/internal/config/compose/services/elastic-agent/docker-compose.yml
+++ b/internal/config/compose/services/elastic-agent/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '2.4'
 services:
   elastic-agent:
-    image: "docker.elastic.co/${elasticAgentDockerNamespace:-beats}/elastic-agent${elasticAgentDockerImageSuffix}:${elasticAgentTag:-7.17.20-23ae4de5-SNAPSHOT}"
+    image: "docker.elastic.co/${elasticAgentDockerNamespace:-beats}/elastic-agent${elasticAgentDockerImageSuffix}:${elasticAgentTag:-7.17.21-5d83bb4d-SNAPSHOT}"
     depends_on:
       elasticsearch:
         condition: service_healthy
diff --git a/internal/config/compose/services/elastic-agent/fleet-server/docker-compose.yml b/internal/config/compose/services/elastic-agent/fleet-server/docker-compose.yml
index 9d2343679..6d2b36300 100644
--- a/internal/config/compose/services/elastic-agent/fleet-server/docker-compose.yml
+++ b/internal/config/compose/services/elastic-agent/fleet-server/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '2.4'
 services:
   fleet-server:
-    image: "docker.elastic.co/${elasticAgentDockerNamespace:-beats}/elastic-agent${elasticAgentDockerImageSuffix}:${elasticAgentTag:-7.17.20-23ae4de5-SNAPSHOT}"
+    image: "docker.elastic.co/${elasticAgentDockerNamespace:-beats}/elastic-agent${elasticAgentDockerImageSuffix}:${elasticAgentTag:-7.17.21-5d83bb4d-SNAPSHOT}"
     depends_on:
       elasticsearch:
         condition: service_healthy
diff --git a/internal/config/compose/services/elasticsearch/docker-compose.yml b/internal/config/compose/services/elasticsearch/docker-compose.yml
index 636142291..1ac0775e6 100644
--- a/internal/config/compose/services/elasticsearch/docker-compose.yml
+++ b/internal/config/compose/services/elasticsearch/docker-compose.yml
@@ -9,7 +9,7 @@ services:
       - xpack.monitoring.collection.enabled=true
       - ELASTIC_USERNAME=elastic
       - ELASTIC_PASSWORD=changeme
-    image: "docker.elastic.co/observability-ci/elasticsearch:${elasticsearchTag:-7.17.20-23ae4de5-SNAPSHOT}"
+    image: "docker.elastic.co/observability-ci/elasticsearch:${elasticsearchTag:-7.17.21-5d83bb4d-SNAPSHOT}"
     platform: ${elasticsearchPlatform:-linux/amd64}
     ports:
       - "9200:9200"
diff --git a/internal/config/compose/services/kibana/docker-compose.yml b/internal/config/compose/services/kibana/docker-compose.yml
index 0378f6e2b..89ac9fcf1 100644
--- a/internal/config/compose/services/kibana/docker-compose.yml
+++ b/internal/config/compose/services/kibana/docker-compose.yml
@@ -9,6 +9,6 @@ services:
       test: "curl -f http://localhost:5601/login | grep kbn-injected-metadata 2>&1 >/dev/null"
       retries: 600
       interval: 1s
-    image: "docker.elastic.co/kibana/kibana:${kibanaTag:-7.17.20-23ae4de5-SNAPSHOT}"
+    image: "docker.elastic.co/kibana/kibana:${kibanaTag:-7.17.21-5d83bb4d-SNAPSHOT}"
     ports:
       - "5601:5601"
diff --git a/internal/config/compose/services/metricbeat/docker-compose.yml b/internal/config/compose/services/metricbeat/docker-compose.yml
index 723408e70..108e8d787 100644
--- a/internal/config/compose/services/metricbeat/docker-compose.yml
+++ b/internal/config/compose/services/metricbeat/docker-compose.yml
@@ -14,7 +14,7 @@ services:
     ]
     environment:
       - BEAT_STRICT_PERMS=${beatStricPerms:-false}
-    image: "docker.elastic.co/${metricbeatDockerNamespace:-beats}/metricbeat:${metricbeatTag:-7.17.20-23ae4de5-SNAPSHOT}"
+    image: "docker.elastic.co/${metricbeatDockerNamespace:-beats}/metricbeat:${metricbeatTag:-7.17.21-5d83bb4d-SNAPSHOT}"
     labels:
       co.elastic.logs/module: "${serviceName}"
     platform: ${stackPlatform:-linux/amd64}
diff --git a/internal/config/kubernetes/base/elasticsearch/deployment.yaml b/internal/config/kubernetes/base/elasticsearch/deployment.yaml
index d9bc286c7..c972639b6 100644
--- a/internal/config/kubernetes/base/elasticsearch/deployment.yaml
+++ b/internal/config/kubernetes/base/elasticsearch/deployment.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
       - name: elasticsearch
-        image: docker.elastic.co/elasticsearch/elasticsearch:7.17.20-23ae4de5-SNAPSHOT
+        image: docker.elastic.co/elasticsearch/elasticsearch:7.17.21-5d83bb4d-SNAPSHOT
         envFrom:
           - configMapRef:
               name: elasticsearch-config
diff --git a/internal/config/kubernetes/base/fleet-server/deployment.yaml b/internal/config/kubernetes/base/fleet-server/deployment.yaml
index 2100aa00d..714456c6d 100644
--- a/internal/config/kubernetes/base/fleet-server/deployment.yaml
+++ b/internal/config/kubernetes/base/fleet-server/deployment.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
       - name: fleet-server
-        image: docker.elastic.co/beats/elastic-agent:7.17.20-23ae4de5-SNAPSHOT
+        image: docker.elastic.co/beats/elastic-agent:7.17.21-5d83bb4d-SNAPSHOT
         env:
         - name: FLEET_SERVER_ENABLE
           value: "1"
diff --git a/internal/config/kubernetes/base/kibana/deployment.yaml b/internal/config/kubernetes/base/kibana/deployment.yaml
index 454d450fe..8fef4cc1e 100644
--- a/internal/config/kubernetes/base/kibana/deployment.yaml
+++ b/internal/config/kubernetes/base/kibana/deployment.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
       - name: kibana
-        image: docker.elastic.co/kibana/kibana:7.17.20-23ae4de5-SNAPSHOT
+        image: docker.elastic.co/kibana/kibana:7.17.21-5d83bb4d-SNAPSHOT
         env:
         - name: ELASTICSEARCH_URL
           value: http://elasticsearch:9200