diff --git a/deploy/cloudformation/elastic-agent-ec2-cnvm.yml b/deploy/cloudformation/elastic-agent-ec2-cnvm.yml
index 864e68f645..ec9d250b58 100644
--- a/deploy/cloudformation/elastic-agent-ec2-cnvm.yml
+++ b/deploy/cloudformation/elastic-agent-ec2-cnvm.yml
@@ -33,11 +33,6 @@ Parameters:
     Description: The version of elastic-agent to install
     Type: String
 
-Conditions:
-  UseElasticTags: !Equals
-    - !Ref "AWS::AccountId"
-    - 704479110758
-
 Resources:
 
   # Security Group for EC2 instance
@@ -139,26 +134,6 @@ Resources:
                   - !Ref "AWS::StackId"
         - Key: Task
           Value: Vulnerability Management Scanner
-        - Key: division
-          Value: !If
-            - UseElasticTags
-            - engineering
-            - AWS::NoValue
-        - Key: org
-          Value: !If
-            - UseElasticTags
-            - security
-            - AWS::NoValue
-        - Key: team
-          Value: !If
-            - UseElasticTags
-            - cloud-security
-            - AWS::NoValue
-        - Key: project
-          Value: !If
-            - UseElasticTags
-            - cloudformation
-            - AWS::NoValue
       ImageId: !Ref LatestAmiId
       InstanceType: !Ref InstanceType
       IamInstanceProfile: !Ref ElasticAgentInstanceProfile
diff --git a/deploy/cloudformation/elastic-agent-ec2-cspm.yml b/deploy/cloudformation/elastic-agent-ec2-cspm.yml
index 64450befd7..c19f2b806f 100644
--- a/deploy/cloudformation/elastic-agent-ec2-cspm.yml
+++ b/deploy/cloudformation/elastic-agent-ec2-cspm.yml
@@ -33,11 +33,6 @@ Parameters:
     Description: The version of elastic-agent to install
     Type: String
 
-Conditions:
-  UseElasticTags: !Equals
-    - !Ref "AWS::AccountId"
-    - 704479110758
-
 Resources:
 
   # Security Group for EC2 instance
@@ -107,26 +102,6 @@ Resources:
                   - !Ref "AWS::StackId"
         - Key: Task
           Value: Cloud Security Posture Management Scanner
-        - Key: division
-          Value: !If
-            - UseElasticTags
-            - engineering
-            - AWS::NoValue
-        - Key: org
-          Value: !If
-            - UseElasticTags
-            - security
-            - AWS::NoValue
-        - Key: team
-          Value: !If
-            - UseElasticTags
-            - cloud-security
-            - AWS::NoValue
-        - Key: project
-          Value: !If
-            - UseElasticTags
-            - cloudformation
-            - AWS::NoValue
       ImageId: !Ref LatestAmiId
       InstanceType: !Ref InstanceType
       IamInstanceProfile: !Ref ElasticAgentInstanceProfile