diff --git a/_variables.tf b/_variables.tf
index 5a5da92..bd88d05 100644
--- a/_variables.tf
+++ b/_variables.tf
@@ -10,4 +10,14 @@ variable "already_exists" {
 variable "enable_aws_sso" {
   default     = false
   description = "Whether the AWS SSO needs to be enabled when creating a new organisation"
+}
+
+variable "enable_compute_optimizer" {
+  default     = false
+  description = "Whether the AWS Compute Optimizer needs to be enabled when creating a new organisation"
+}
+
+variable "enable_cost_optimizer" {
+  default     = false
+  description = "Whether the AWS Compute Optimize needs to be enabled when creating a new organisation"
 }
\ No newline at end of file
diff --git a/organization.tf b/organization.tf
index 15b4844..1489b9e 100644
--- a/organization.tf
+++ b/organization.tf
@@ -5,6 +5,8 @@ resource "aws_organizations_organization" "org" {
     "cloudtrail.amazonaws.com",
     "config.amazonaws.com",
     var.enable_aws_sso ? "sso.amazonaws.com" : "",
+    var.enable_compute_optimizer ? "compute-optimizer.amazonaws.com" : "",
+    var.enable_cost_optimizer ? "cost-optimization-hub.bcm.amazonaws.com" : "",
   ]
 
   enabled_policy_types = ["SERVICE_CONTROL_POLICY"]