diff --git a/src/clj/user.clj b/src/clj/user.clj
index 15d81481..0ad1d253 100644
--- a/src/clj/user.clj
+++ b/src/clj/user.clj
@@ -734,3 +734,13 @@
        (mapcat identity)
        vec))
 
+(defn get-idents []
+  (->> (d/q '[:find ?i
+              :in $ 
+              :where [_ :db/ident ?i]]
+            (d/db auto-ap.datomic/conn) )
+       (mapcat identity)
+       (map str)
+       (sort)
+       vec))
+
diff --git a/terraform/prod-background-worker-taskdef.json b/terraform/prod-background-worker-taskdef.json
index 18b8765a..6ec82e29 100644
--- a/terraform/prod-background-worker-taskdef.json
+++ b/terraform/prod-background-worker-taskdef.json
@@ -1,37 +1,58 @@
-         [
+[
+    {
+        "environment": [
             {
-                "name": "integreat-app",
-                "image": "679918342773.dkr.ecr.us-east-1.amazonaws.com/integreat",
-                "portMappings": [
-                    {
-                        "containerPort": 9000,
-                        "hostPort": 9000,
-                        "protocol": "tcp"
-                    },
-                    {
-                        "containerPort": 9090,
-                        "hostPort": 9090,
-                        "protocol": "tcp"
-                    }
-
-
-                ],
-                "essential": true,
-                "environment": [
-                    {
-                        "name": "config",
-                        "value": "/usr/local/config/prod-background-worker.edn"
-                    }
-                ],
-                "mountPoints": [],
-                "volumesFrom": [],
-                "logConfiguration": {
-                    "logDriver": "awslogs",
-                    "options": {
-                        "awslogs-group": "/ecs/integreat-background-worker-prod",
-                        "awslogs-region": "us-east-1",
-                        "awslogs-stream-prefix": "ecs"
-                    }
-                }
+                "name": "config",
+                "value": "/usr/local/config/prod-background-worker.edn"
+            },
+            {
+                "name": "which_env",
+                "value": "prod"
             }
-        ]
+        ],
+        "essential": true,
+        "image": "679918342773.dkr.ecr.us-east-1.amazonaws.com/integreat:prod",
+        "logConfiguration": {
+            "logDriver": "awslogs",
+            "options": {
+                "awslogs-group": "/ecs/integreat-background-worker-prod",
+                "awslogs-region": "us-east-1",
+                "awslogs-stream-prefix": "ecs"
+            }
+        },
+        "mountPoints": [],
+        "name": "integreat-app",
+        "portMappings": [
+            {
+                "containerPort": 9000,
+                "hostPort": 9000,
+                "protocol": "tcp"
+            },
+            {
+                "containerPort": 9090,
+                "hostPort": 9090,
+                "protocol": "tcp"
+            }
+        ],
+        "volumesFrom": []
+    },
+    {
+        "environment": [
+            {
+                "name": "DD_API_KEY",
+                "value": "ce10d932c47b358e81081ae67bd8c112"
+            },
+            {
+                "name": "ECS_FARGATE",
+                "value": "true"
+            },
+            {
+                "name": "DD_DOCKER_ENV_AS_TAGS",
+                "value": "{\"which_env\":\"env\"}"
+            }
+        ],
+        "essential": true,
+        "image": "public.ecr.aws/datadog/agent:latest",
+        "name": "datadog-agent"
+    }
+]
diff --git a/terraform/prod-taskdef.json b/terraform/prod-taskdef.json
index 2e650158..36d05da0 100644
--- a/terraform/prod-taskdef.json
+++ b/terraform/prod-taskdef.json
@@ -1,40 +1,63 @@
-         [
+[
+    {
+        "environment": [
             {
-                "name": "integreat-app",
-                "image": "679918342773.dkr.ecr.us-east-1.amazonaws.com/integreat",
-                "portMappings": [
-                    {
-                        "containerPort": 3000,
-                        "hostPort": 3000,
-                        "protocol": "tcp"
-                    },
-                    {
-                        "containerPort": 9000,
-                        "hostPort": 9000,
-                        "protocol": "tcp"
-                    },
-                    {
-                        "containerPort": 9090,
-                        "hostPort": 9090,
-                        "protocol": "tcp"
-                    }
-                ],
-                "essential": true,
-                "environment": [
-                    {
-                        "name": "config",
-                        "value": "/usr/local/config/prod.edn"
-                    }
-                ],
-                "mountPoints": [],
-                "volumesFrom": [],
-                "logConfiguration": {
-                    "logDriver": "awslogs",
-                    "options": {
-                        "awslogs-group": "/ecs/integreat-app-prod",
-                        "awslogs-region": "us-east-1",
-                        "awslogs-stream-prefix": "ecs"
-                    }
-                }
+                "name": "config",
+                "value": "/usr/local/config/prod.edn"
+            },
+            {
+                "name": "which_env",
+                "value": "prod"
             }
-        ]
+        ],
+        "essential": true,
+        "image": "679918342773.dkr.ecr.us-east-1.amazonaws.com/integreat",
+        "logConfiguration": {
+            "logDriver": "awslogs",
+            "options": {
+                "awslogs-group": "/ecs/integreat-app-prod",
+                "awslogs-region": "us-east-1",
+                "awslogs-stream-prefix": "ecs"
+            }
+        },
+        "mountPoints": [],
+        "name": "integreat-app",
+        "portMappings": [
+            {
+                "containerPort": 3000,
+                "hostPort": 3000,
+                "protocol": "tcp"
+            },
+            {
+                "containerPort": 9000,
+                "hostPort": 9000,
+                "protocol": "tcp"
+            },
+            {
+                "containerPort": 9090,
+                "hostPort": 9090,
+                "protocol": "tcp"
+            }
+        ],
+        "volumesFrom": []
+    },
+    {
+        "environment": [
+            {
+                "name": "DD_API_KEY",
+                "value": "ce10d932c47b358e81081ae67bd8c112"
+            },
+            {
+                "name": "ECS_FARGATE",
+                "value": "true"
+            },
+            {
+                "name": "DD_DOCKER_ENV_AS_TAGS",
+                "value": "{\"which_env\":\"env\"}"
+            }
+        ],
+        "essential": true,
+        "image": "public.ecr.aws/datadog/agent:latest",
+        "name": "datadog-agent"
+    }
+]