diff --git a/deployments/aws/ecs/ecs-temporal.tf b/deployments/aws/ecs/ecs-temporal.tf
index 0327d2c4a..bd03f6816 100644
--- a/deployments/aws/ecs/ecs-temporal.tf
+++ b/deployments/aws/ecs/ecs-temporal.tf
@@ -6,7 +6,7 @@ resource "aws_ecs_task_definition" "temporal_task_definition" {
   requires_compatibilities = ["FARGATE"]
   cpu                      = var.temporal_cpu
   memory                   = var.temporal_memory
-  execution_role_arn       = aws_iam_role.temporal_execution.arn
+  execution_role_arn       = aws_iam_role.temporal_execution[0].arn
   task_role_arn            = aws_iam_role.temporal_task[0].arn
 
   runtime_platform {
diff --git a/deployments/aws/ecs/iam.tf b/deployments/aws/ecs/iam.tf
index a30ed5ad7..b0fb1892b 100644
--- a/deployments/aws/ecs/iam.tf
+++ b/deployments/aws/ecs/iam.tf
@@ -130,40 +130,6 @@ resource "aws_iam_role_policy_attachment" "worker_execution_secrets" {
   role       = aws_iam_role.worker_execution.name
 }
 
-# Executor execution role
-resource "aws_iam_role" "executor_execution" {
-  name               = "TracecatExecutorExecutionRole"
-  assume_role_policy = data.aws_iam_policy_document.assume_role.json
-}
-
-# UI execution role
-resource "aws_iam_role" "ui_execution" {
-  name               = "TracecatUIExecutionRole"
-  assume_role_policy = data.aws_iam_policy_document.assume_role.json
-}
-
-resource "aws_iam_role_policy_attachment" "ui_execution_ecs_poll" {
-  policy_arn = aws_iam_policy.ecs_poll.arn
-  role       = aws_iam_role.ui_execution.name
-}
-
-# Temporal execution role
-resource "aws_iam_role" "temporal_execution" {
-  name               = "TracecatTemporalExecutionRole"
-  assume_role_policy = data.aws_iam_policy_document.assume_role.json
-}
-
-resource "aws_iam_role_policy_attachment" "temporal_execution_ecs_poll" {
-  policy_arn = aws_iam_policy.ecs_poll.arn
-  role       = aws_iam_role.temporal_execution.name
-}
-
-resource "aws_iam_role_policy_attachment" "temporal_execution_secrets" {
-  count      = var.disable_temporal_autosetup ? 0 : 1
-  policy_arn = aws_iam_policy.temporal_secrets_access[0].arn
-  role       = aws_iam_role.temporal_execution.name
-}
-
 # API and Worker task role
 resource "aws_iam_role" "api_worker_task" {
   name               = "TracecatAPIWorkerTaskRole"
@@ -196,6 +162,42 @@ resource "aws_iam_role_policy_attachment" "api_worker_task_secrets" {
   role       = aws_iam_role.api_worker_task.name
 }
 
+# Executor execution role
+resource "aws_iam_role" "executor_execution" {
+  name               = "TracecatExecutorExecutionRole"
+  assume_role_policy = data.aws_iam_policy_document.assume_role.json
+}
+
+# UI execution role
+resource "aws_iam_role" "ui_execution" {
+  name               = "TracecatUIExecutionRole"
+  assume_role_policy = data.aws_iam_policy_document.assume_role.json
+}
+
+resource "aws_iam_role_policy_attachment" "ui_execution_ecs_poll" {
+  policy_arn = aws_iam_policy.ecs_poll.arn
+  role       = aws_iam_role.ui_execution.name
+}
+
+# Temporal execution role
+resource "aws_iam_role" "temporal_execution" {
+  count              = var.disable_temporal_autosetup ? 0 : 1
+  name               = "TracecatTemporalExecutionRole"
+  assume_role_policy = data.aws_iam_policy_document.assume_role.json
+}
+
+resource "aws_iam_role_policy_attachment" "temporal_execution_ecs_poll" {
+  count      = var.disable_temporal_autosetup ? 0 : 1
+  policy_arn = aws_iam_policy.ecs_poll.arn
+  role       = aws_iam_role.temporal_execution[0].name
+}
+
+resource "aws_iam_role_policy_attachment" "temporal_execution_secrets" {
+  count      = var.disable_temporal_autosetup ? 0 : 1
+  policy_arn = aws_iam_policy.temporal_secrets_access[0].arn
+  role       = aws_iam_role.temporal_execution[0].name
+}
+
 # Temporal task role
 resource "aws_iam_role" "temporal_task" {
   count              = var.disable_temporal_autosetup ? 0 : 1
@@ -224,7 +226,6 @@ resource "aws_iam_role_policy" "temporal_task_db_access" {
   })
 }
 
-
 # Caddy execution role
 resource "aws_iam_role" "caddy_execution" {
   name               = "TracecatCaddyExecutionRole"
@@ -280,8 +281,9 @@ resource "aws_iam_role_policy_attachment" "ui_execution_cloudwatch_logs" {
 }
 
 resource "aws_iam_role_policy_attachment" "temporal_execution_cloudwatch_logs" {
+  count      = var.disable_temporal_autosetup ? 0 : 1
   policy_arn = aws_iam_policy.cloudwatch_logs.arn
-  role       = aws_iam_role.temporal_execution.name
+  role       = aws_iam_role.temporal_execution[0].name
 }
 
 resource "aws_iam_role_policy_attachment" "caddy_execution_cloudwatch_logs" {