diff --git a/.github/.goss.yaml b/.github/.goss.yaml
index 4354ab1d..6ccdf185 100644
--- a/.github/.goss.yaml
+++ b/.github/.goss.yaml
@@ -1,5 +1,5 @@
 file:
-  /var/wazuh-manager/bin/wazuh-control:
+  /var/wazuh-manager/bin/wazuh-manager-control:
     exists: true
     mode: "0750"
     owner: root
diff --git a/.github/workflows/5_pr_check.yml b/.github/workflows/5_pr_check.yml
index ae2e4617..bfae45b7 100644
--- a/.github/workflows/5_pr_check.yml
+++ b/.github/workflows/5_pr_check.yml
@@ -292,7 +292,7 @@ jobs:
         for i in {1..5}; do
           TOKEN=$(curl -s -u ${{ env.API_USERNAME }}:${{ env.API_PASSWORD }} -k -X GET "https://127.0.0.1:55000/security/user/authenticate?raw=true")
           agents="`curl -k -s -X GET "https://127.0.0.1:55000/agents?pretty=true" -H  "Authorization: Bearer ${TOKEN}" | jq -r .data.affected_items | grep active | wc -l`"
-          if [[ $agents -gt 1 ]]; then
+          if [[ $agents -gt 0 ]]; then
             echo "Wazuh agents: ${agents}"
             echo "OK"
             enrolled=true
@@ -580,7 +580,7 @@ jobs:
         for i in {1..5}; do
           TOKEN=$(curl -s -u ${{ env.API_USERNAME }}:${{ env.API_PASSWORD }} -k -X GET "https://127.0.0.1:55000/security/user/authenticate?raw=true")
           agents="`curl -k -s -X GET "https://127.0.0.1:55000/agents?pretty=true" -H  "Authorization: Bearer ${TOKEN}" | jq -r .data.affected_items | grep active | wc -l`"
-          if [[ $agents -gt 1 ]]; then
+          if [[ $agents -gt 0 ]]; then
             echo "Wazuh agents: ${agents}"
             echo "OK"
             enrolled=true
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cefb7ac0..b2179e9c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ All notable changes to this project will be documented in this file.
 
 ### Changed
 
+- Change Wazuh manager certificates names ([#2223](https://github.com/wazuh/wazuh-docker/pull/2223))
 - Move index documents test ([#2221](https://github.com/wazuh/wazuh-docker/pull/2221))
 - Separate Agent/Manager - Docker - Adapt image build process ([#2220](https://github.com/wazuh/wazuh-docker/pull/2220))
 - Remove revision input ([#2217](https://github.com/wazuh/wazuh-docker/pull/2217))
diff --git a/build-docker-images/wazuh-manager/config/etc/cont-init.d/1-manager b/build-docker-images/wazuh-manager/config/etc/cont-init.d/1-manager
index d8944a82..448832b9 100644
--- a/build-docker-images/wazuh-manager/config/etc/cont-init.d/1-manager
+++ b/build-docker-images/wazuh-manager/config/etc/cont-init.d/1-manager
@@ -108,8 +108,8 @@ function_entrypoint_scripts() {
 function_configure_vulnerability_detection() {
 if [ "$INDEXER_PASSWORD" != "" ]; then
   >&2 echo "Configuring password."
-    echo "$INDEXER_USERNAME" | /var/wazuh-manager/bin/wazuh-keystore -f indexer -k username
-    echo "$INDEXER_PASSWORD" | /var/wazuh-manager/bin/wazuh-keystore -f indexer -k password
+    echo "$INDEXER_USERNAME" | /var/wazuh-manager/bin/wazuh-manager-keystore -f indexer -k username
+    echo "$INDEXER_PASSWORD" | /var/wazuh-manager/bin/wazuh-manager-keystore -f indexer -k password
 fi
 }
 
@@ -126,4 +126,4 @@ function_configure_vulnerability_detection
 function_entrypoint_scripts
 
 # Start Wazuh
-/var/wazuh-manager/bin/wazuh-control start
+/var/wazuh-manager/bin/wazuh-manager-control start
diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml
index 1b2d972f..8eafe5ce 100644
--- a/multi-node/docker-compose.yml
+++ b/multi-node/docker-compose.yml
@@ -34,8 +34,8 @@ services:
       - master-wazuh-var-multigroups:/var/wazuh-manager/var/multigroups
       - master-wazuh-active-response:/var/wazuh-manager/active-response/bin
       - ./wazuh-certificates/root-ca.pem:/var/wazuh-manager/etc/certs/root-ca.pem
-      - ./wazuh-certificates/wazuh.master.pem:/var/wazuh-manager/etc/certs/server.pem
-      - ./wazuh-certificates/wazuh.master-key.pem:/var/wazuh-manager/etc/certs/server-key.pem
+      - ./wazuh-certificates/wazuh.master.pem:/var/wazuh-manager/etc/certs/manager.pem
+      - ./wazuh-certificates/wazuh.master-key.pem:/var/wazuh-manager/etc/certs/manager-key.pem
   wazuh.worker:
     image: wazuh/wazuh-manager:5.0.0
     hostname: wazuh.worker
@@ -66,8 +66,8 @@ services:
       - worker-wazuh-var-multigroups:/var/wazuh-manager/var/multigroups
       - worker-wazuh-active-response:/var/wazuh-manager/active-response/bin
       - ./wazuh-certificates/root-ca.pem:/var/wazuh-manager/etc/certs/root-ca.pem
-      - ./wazuh-certificates/wazuh.worker.pem:/var/wazuh-manager/etc/certs/server.pem
-      - ./wazuh-certificates/wazuh.worker-key.pem:/var/wazuh-manager/etc/certs/server-key.pem
+      - ./wazuh-certificates/wazuh.worker.pem:/var/wazuh-manager/etc/certs/manager.pem
+      - ./wazuh-certificates/wazuh.worker-key.pem:/var/wazuh-manager/etc/certs/manager-key.pem
 
   wazuh1.indexer:
     image: wazuh/wazuh-indexer:5.0.0
diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml
index ae7334ca..58a74613 100644
--- a/single-node/docker-compose.yml
+++ b/single-node/docker-compose.yml
@@ -34,8 +34,8 @@ services:
       - wazuh_var_multigroups:/var/wazuh-manager/var/multigroups
       - wazuh_active_response:/var/wazuh-manager/active-response/bin
       - ./wazuh-certificates/root-ca.pem:/var/wazuh-manager/etc/certs/root-ca.pem
-      - ./wazuh-certificates/wazuh.manager.pem:/var/wazuh-manager/etc/certs/server.pem
-      - ./wazuh-certificates/wazuh.manager-key.pem:/var/wazuh-manager/etc/certs/server-key.pem
+      - ./wazuh-certificates/wazuh.manager.pem:/var/wazuh-manager/etc/certs/manager.pem
+      - ./wazuh-certificates/wazuh.manager-key.pem:/var/wazuh-manager/etc/certs/manager-key.pem
 
   wazuh.indexer:
     image: wazuh/wazuh-indexer:5.0.0