diff --git a/.github/workflows/main_aio.yml b/.github/workflows/main_aio.yml
index 2e54c52c..24532959 100644
--- a/.github/workflows/main_aio.yml
+++ b/.github/workflows/main_aio.yml
@@ -28,7 +28,9 @@ jobs:
           aws-resource-tags: > # optional, requires additional permissions
             [
               {"Key": "Name", "Value": "wazuh-ansible-gh-runner-aio"},
-              {"Key": "GitHubRepository", "Value": "${{ github.repository }}"}
+              {"Key": "GitHubRepository", "Value": "${{ github.repository }}"},
+              {"Key": "team", "Value": "CICD"},
+              {"Key": "termination_Date", "Value": "N/A"}
             ]
   install-aio-single-instance:
     name: Installs AIO single instance
diff --git a/.github/workflows/main_wazuh.yml b/.github/workflows/main_wazuh.yml
index a6954a23..74725392 100644
--- a/.github/workflows/main_wazuh.yml
+++ b/.github/workflows/main_wazuh.yml
@@ -28,7 +28,9 @@ jobs:
           aws-resource-tags: > # optional, requires additional permissions
             [
               {"Key": "Name", "Value": "wazuh-ansible-gh-runner-wazuh"},
-              {"Key": "GitHubRepository", "Value": "${{ github.repository }}"}
+              {"Key": "GitHubRepository", "Value": "${{ github.repository }}"},
+              {"Key": "team", "Value": "CICD"},
+              {"Key": "termination_Date", "Value": "N/A"}
             ]
   install-wazuh-single-instance:
     name: Installs Wazuh server single instance