diff --git a/src/clj/auto_ap/jobs/square.clj b/src/clj/auto_ap/jobs/square.clj
index b307f455..884a4b35 100644
--- a/src/clj/auto_ap/jobs/square.clj
+++ b/src/clj/auto_ap/jobs/square.clj
@@ -5,14 +5,14 @@
             [mount.core :as mount]
             [auto-ap.datomic :refer [conn]]
             [clojure.tools.logging :as log]
-            [auto-ap.background.metrics :refer [metrics-setup]]
+            [auto-ap.background.metrics :refer [metrics-setup container-tags logging-context]]
             [unilog.context :as lc]))
 
 (defn -main [& _]
   (lc/with-context {:background-job "square-loading-new"}
-    (mount/start (mount/only #{#'conn #'metrics-setup}))
+    (mount/start (mount/only #{#'conn #'metrics-setup #'container-tags #'logging-context}))
     ((heartbeat square/upsert-all "square-loading"))
-    (mount/stop (mount/only #{#'conn #'metrics-setup}))
+    (mount/stop )
     (log/info "Stopping Square loading")
     (System/exit 0)))
 
diff --git a/terraform/deploy.tf b/terraform/deploy.tf
index 61e99e69..f1258409 100644
--- a/terraform/deploy.tf
+++ b/terraform/deploy.tf
@@ -356,7 +356,8 @@ resource "aws_cloudwatch_event_target" "square_import_job_target" {
     {
       "name": "integreat-app",
       "environment": [{"name": "INTEGREAT_JOB", "value": "square-import-job"},
-                      {"name": "DD_CONTAINER_ENV_AS_TAGS", "value":"{\"INTEGREAT_JOB\":\"background_job\"}"}]
+                      {"name": "DD_CONTAINER_ENV_AS_TAGS", "value":"{\"INTEGREAT_JOB\":\"background_job\"}"},
+                      {"name": "DD_SERVICE", "value": "square-import-job"}]
     }
   ]
 }
diff --git a/terraform/terraform.tfstate.d/prod/terraform.tfstate b/terraform/terraform.tfstate.d/prod/terraform.tfstate
index b92f774b..7bb16159 100644
--- a/terraform/terraform.tfstate.d/prod/terraform.tfstate
+++ b/terraform/terraform.tfstate.d/prod/terraform.tfstate
@@ -1,7 +1,7 @@
 {
   "version": 4,
   "terraform_version": "1.2.7",
-  "serial": 123,
+  "serial": 141,
   "lineage": "9b630886-8cee-a57d-c7a2-4f19f13f9c51",
   "outputs": {
     "aws_access_key_id": {
@@ -153,7 +153,7 @@
             "event_bus_name": "default",
             "http_target": [],
             "id": "square-import-job-schedule-square-import-job",
-            "input": "{\n  \"containerOverrides\": [\n    {\n      \"name\": \"integreat-app\",\n      \"environment\": [{\"name\": \"INTEGREAT_JOB\", \"value\": \"square-import-job\"},\n                      {\"name\": \"DD_CONTAINER_ENV_AS_TAGS\", \"value\":\"{\\\"INTEGREAT_JOB\\\":\\\"background_job\\\"}\"}]\n    }\n  ]\n}\n",
+            "input": "{\n  \"containerOverrides\": [\n    {\n      \"name\": \"integreat-app\",\n      \"environment\": [{\"name\": \"INTEGREAT_JOB\", \"value\": \"square-import-job\"},\n                      {\"name\": \"DD_CONTAINER_ENV_AS_TAGS\", \"value\":\"{\\\"INTEGREAT_JOB\\\":\\\"background_job\\\"}\"},\n                      {\"name\": \"DD_SERVICE\", \"value\": \"square-import-job\"}]\n    }\n  ]\n}\n",
             "input_path": "",
             "input_transformer": [],
             "kinesis_target": [],
@@ -255,7 +255,7 @@
             ],
             "tags": {},
             "tags_all": {},
-            "task_definition": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_app_prod:355",
+            "task_definition": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_app_prod:356",
             "timeouts": {
               "delete": null
             },
@@ -334,7 +334,7 @@
             ],
             "tags": {},
             "tags_all": {},
-            "task_definition": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_background-worker_prod:333",
+            "task_definition": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_background-worker_prod:334",
             "timeouts": {
               "delete": null
             },
diff --git a/terraform/terraform.tfstate.d/prod/terraform.tfstate.backup b/terraform/terraform.tfstate.d/prod/terraform.tfstate.backup
index 0eb02943..3905f037 100644
--- a/terraform/terraform.tfstate.d/prod/terraform.tfstate.backup
+++ b/terraform/terraform.tfstate.d/prod/terraform.tfstate.backup
@@ -1,7 +1,7 @@
 {
   "version": 4,
   "terraform_version": "1.2.7",
-  "serial": 121,
+  "serial": 139,
   "lineage": "9b630886-8cee-a57d-c7a2-4f19f13f9c51",
   "outputs": {
     "aws_access_key_id": {
@@ -101,7 +101,7 @@
             "name": "square-import-job-schedule",
             "name_prefix": "",
             "role_arn": "",
-            "schedule_expression": "rate(4 hours)",
+            "schedule_expression": "cron(06 * * * ? *)",
             "tags": {},
             "tags_all": {}
           },
@@ -153,7 +153,7 @@
             "event_bus_name": "default",
             "http_target": [],
             "id": "square-import-job-schedule-square-import-job",
-            "input": "{\n  \"containerOverrides\": [\n    {\n      \"name\": \"integreat-app\",\n      \"environment\": [{\"name\": \"INTEGREAT_JOB\", \"value\": \"square-import-job\"},\n                      {\"name\": \"DD_SERVICE\", \"value\": \"square-import-job\"},\n                      {\"name\": \"DD_CONTAINER_ENV_AS_TAGS\", \"value\":\"{\\\"INTEGREAT_JOB\\\":\\\"task_family\\\"}\"}] \n    }\n  ]\n}\n",
+            "input": "{\n  \"containerOverrides\": [\n    {\n      \"name\": \"integreat-app\",\n      \"environment\": [{\"name\": \"INTEGREAT_JOB\", \"value\": \"square-import-job\"},\n                      {\"name\": \"DD_CONTAINER_ENV_AS_TAGS\", \"value\":\"{\\\"INTEGREAT_JOB\\\":\\\"background_job\\\"}\"},\n                      {\"name\": \"DD_SERVICE\", \"value\": \"square-import-job\"}]\n    }\n  ]\n}\n",
             "input_path": "",
             "input_transformer": [],
             "kinesis_target": [],
@@ -255,7 +255,7 @@
             ],
             "tags": {},
             "tags_all": {},
-            "task_definition": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_app_prod:354",
+            "task_definition": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_app_prod:356",
             "timeouts": {
               "delete": null
             },
@@ -334,7 +334,7 @@
             ],
             "tags": {},
             "tags_all": {},
-            "task_definition": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_background-worker_prod:332",
+            "task_definition": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_background-worker_prod:334",
             "timeouts": {
               "delete": null
             },