diff --git a/build-docker-images/build-images.sh b/build-docker-images/build-images.sh
index 583eeaa9..6acdb2d3 100755
--- a/build-docker-images/build-images.sh
+++ b/build-docker-images/build-images.sh
@@ -71,6 +71,7 @@ build() {
     echo WAZUH_UI_REVISION=$WAZUH_UI_REVISION >> .env
 
     docker-compose -f build-docker-images/build-images.yml --env-file .env build --no-cache
+    docker build -t wazuh/wazuh-cert-tool:$WAZUH_IMAGE_VERSION build-docker-images/cert-tool-image/
 
     return 0
 }
diff --git a/indexer-certs-creator/Dockerfile b/build-docker-images/cert-tool-image/Dockerfile
similarity index 67%
rename from indexer-certs-creator/Dockerfile
rename to build-docker-images/cert-tool-image/Dockerfile
index 58b2583f..92c3cbac 100644
--- a/indexer-certs-creator/Dockerfile
+++ b/build-docker-images/cert-tool-image/Dockerfile
@@ -1,7 +1,8 @@
 # Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
-FROM ubuntu:focal
+FROM amazonlinux:2023
 
-RUN apt-get update && apt-get install openssl curl -y
+RUN yum install curl-minimal openssl -y &&\
+yum clean all
 
 WORKDIR /
 
diff --git a/indexer-certs-creator/config/entrypoint.sh b/build-docker-images/cert-tool-image/config/entrypoint.sh
similarity index 100%
rename from indexer-certs-creator/config/entrypoint.sh
rename to build-docker-images/cert-tool-image/config/entrypoint.sh
diff --git a/indexer-certs-creator/README.md b/indexer-certs-creator/README.md
deleted file mode 100644
index b7dbc565..00000000
--- a/indexer-certs-creator/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Certificate creation image build
-
-The dockerfile hosted in this directory is used to build the image used to boot Wazuh's single node and multi node stacks.
-
-To create the image, the following command must be executed:
-
-```
-$ docker build -t wazuh/wazuh-certs-generator:0.0.1 .
-```
diff --git a/multi-node/generate-indexer-certs.yml b/multi-node/generate-indexer-certs.yml
index dbf2b079..a118f0be 100644
--- a/multi-node/generate-indexer-certs.yml
+++ b/multi-node/generate-indexer-certs.yml
@@ -3,8 +3,9 @@ version: '3'
 
 services:
   generator:
-    image: wazuh/wazuh-certs-generator:0.0.2
-    hostname: wazuh-certs-generator
+    image: wazuh/wazuh-cert-tool:4.7.5
+    hostname: wazuh-cert-tool
+    container_name: wazuh-cert-tool
     volumes:
       - ./config/wazuh_indexer_ssl_certs/:/certificates/
       - ./config/certs.yml:/config/certs.yml
\ No newline at end of file
diff --git a/single-node/generate-indexer-certs.yml b/single-node/generate-indexer-certs.yml
index 3e0eb6fd..efcd8d87 100644
--- a/single-node/generate-indexer-certs.yml
+++ b/single-node/generate-indexer-certs.yml
@@ -3,8 +3,9 @@ version: '3'
 
 services:
   generator:
-    image: wazuh/wazuh-certs-generator:0.0.2
-    hostname: wazuh-certs-generator
+    image: wazuh/wazuh-cert-tool:5.0.0
+    hostname: wazuh-cert-tool
+    container_name: wazuh-cert-tool
     volumes:
       - ./config/wazuh_indexer_ssl_certs/:/certificates/
       - ./config/certs.yml:/config/certs.yml