diff --git a/buildspec.yml b/buildspec.yml
index 8c5fc9ed..635a7084 100644
--- a/buildspec.yml
+++ b/buildspec.yml
@@ -21,19 +21,18 @@ phases:
     commands:
       - npm install
       - ./lein build
-      - cp imagedefinitions.json target/
       - echo Build started on `date`
       - echo Building the Docker image...
-      - docker build -t $REPOSITORY_URI:latest .
-      - docker tag $REPOSITORY_URI:latest $REPOSITORY_URI:$IMAGE_TAG
+      - docker build -t $REPOSITORY_URI:$TAG_NAME .
+      - docker tag $REPOSITORY_URI:$TAG_NAME $REPOSITORY_URI:$IMAGE_TAG
   post_build:
     commands:
       - echo Build completed on `date`
       - echo Pushing the Docker images...
-      - docker push $REPOSITORY_URI:latest
+      - docker push $REPOSITORY_URI:$TAG_NAME
       - docker push $REPOSITORY_URI:$IMAGE_TAG
       - echo Writing image definitions file...
-      - printf '[{"name":"integreat","imageUri":"%s"}]' $REPOSITORY_URI:$IMAGE_TAG > imagedefinitions.json
+      - printf '[{"name":"integreat-app","imageUri":"%s"}]' $REPOSITORY_URI:$IMAGE_TAG > target/imagedefinitions.json
 artifacts:
   files:
     - auto-ap.jar
diff --git a/config/staging-background-worker.edn b/config/staging-background-worker.edn
new file mode 100644
index 00000000..7948a082
--- /dev/null
+++ b/config/staging-background-worker.edn
@@ -0,0 +1,148 @@
+{:db {:server "database"}
+ :datomic-url "datomic:ddb://us-east-1/integreat/integreat-staging"
+ :scheme "https"
+ :jwt-secret "auto ap invoices are awesome"
+ :invoice-import-queue-url "https://sqs.us-east-1.amazonaws.com/679918342773/integreat-mail-staging" 
+ :requests-queue-url "https://sqs.us-east-1.amazonaws.com/679918342773/integreat-background-request-staging" 
+ :invoice-email "invoices-staging@mail.app.integreatconsult.com"
+ :data-bucket "data.staging.app.integreatconsult.com"
+ :yodlee-cobrand-name "qstartus12"
+ :yodlee-cobrand-login "qstartus12"
+ :yodlee-cobrand-password  "MPD@mg78hd"
+ :yodlee-user-login "integreat"
+ :yodlee-user-password "Import3transactions!"
+ :yodlee-base-url "https://quickstart2.api.yodlee.com/ysl"
+ :yodlee-app "10003600"
+ :yodlee-fastlink "https://quickstartus2node.yodleeinteractive.com/authenticate/qstartus12/?channelAppName=quickstartus2"
+ :yodlee-proxy-host "172.31.10.83"
+ :yodlee-proxy-port 8888
+ :run-background? false
+ :run-web? true
+ :yodlee2-admin-user "e02b38f9-9865-4264-8e4f-6a5ac2c500b0_ADMIN"
+ :yodlee2-integreat-user "integreat-main"
+ :yodlee2-client-id "l6sUyK2NEq3mwopISHlFGWUcJ1U8OUQd"
+ :yodlee2-client-secret "wZQHoGEkv5AGG2ZH"
+ :yodlee2-base-url "https://development.api.yodlee.com/ysl"
+ :yodlee2-fastlink "https://fl4.preprod.yodlee.com/authenticate/USDevexPreProd2-195/fastlink/?channelAppName=usdevexpreprod2"
+ :yodlee2-proxy-host "172.31.10.83"
+ :yodlee2-proxy-port 8888
+
+ :square-config {"NGE1"
+                 {:square-location "SCX0Y8CTGM1S0",
+                  :location "UC",
+                  :token "EAAAEO2xSqesDutZz71hz3eulKmrlKTiEqG3uZ4j25x5GYlOluQ2cj2JxNUXqXD7"},
+                 "NGOP"
+                 {:square-location "L3GMNBFARX9GG",
+                  :location "OP",
+                  :token "EAAAEO2xSqesDutZz71hz3eulKmrlKTiEqG3uZ4j25x5GYlOluQ2cj2JxNUXqXD7"},
+                 "NGDG"
+                 {:square-location "LQTHXQY69MYB6",
+                  :location "DB",
+                  :token "EAAAEO2xSqesDutZz71hz3eulKmrlKTiEqG3uZ4j25x5GYlOluQ2cj2JxNUXqXD7"},
+                 "NGPG"
+                 {:square-location "AMQ0NPA8FGDEF",
+                  :location "SZ",
+                  :token "EAAAEO2xSqesDutZz71hz3eulKmrlKTiEqG3uZ4j25x5GYlOluQ2cj2JxNUXqXD7"},
+                 "NGEZ"
+                 {:square-location "L0Z167T2T7W7F",
+                  :location "JS",
+                  :token "EAAAEO2xSqesDutZz71hz3eulKmrlKTiEqG3uZ4j25x5GYlOluQ2cj2JxNUXqXD7"},
+                 "NGLK"
+                 {:square-location "LRC7WVD77ZM81",
+                  :location "SM",
+                  :token "EAAAEO2xSqesDutZz71hz3eulKmrlKTiEqG3uZ4j25x5GYlOluQ2cj2JxNUXqXD7"},
+                 "NGA1"
+                 {:square-location "FZ3ZYC77T3W1T",
+                  :location "KA",
+                  :token "EAAAEO2xSqesDutZz71hz3eulKmrlKTiEqG3uZ4j25x5GYlOluQ2cj2JxNUXqXD7"},
+                 "NGKG"
+                 {:square-location "8JT71V8XGYAT3",
+                  :location "NB",
+                  :token "EAAAEO2xSqesDutZz71hz3eulKmrlKTiEqG3uZ4j25x5GYlOluQ2cj2JxNUXqXD7"},
+                 "NGEB"
+                 {:square-location "LEV4GM1JPJS6R",
+                  :location "CV",
+                  :token "EAAAEO2xSqesDutZz71hz3eulKmrlKTiEqG3uZ4j25x5GYlOluQ2cj2JxNUXqXD7"},
+                 "NGGG"
+                 {:square-location "L7S9MXZBJ00HY",
+                  :location "LM",
+                  :token "EAAAEO2xSqesDutZz71hz3eulKmrlKTiEqG3uZ4j25x5GYlOluQ2cj2JxNUXqXD7"},
+                 "NGRV"
+                 {:square-location "L0J45VZKHWXVR",
+                  :location "RV",
+                  :token "EAAAEO2xSqesDutZz71hz3eulKmrlKTiEqG3uZ4j25x5GYlOluQ2cj2JxNUXqXD7"},
+                 "NGSM"
+                 {:square-location "LG5X0MHA4NZDM",
+                  :location "SM",
+                  :token "EAAAEO2xSqesDutZz71hz3eulKmrlKTiEqG3uZ4j25x5GYlOluQ2cj2JxNUXqXD7"},
+                 "NGZO"
+                 {:square-location "KMVFQ9CRCXJ10",
+                  :location "VT",
+                  :token "EAAAEO2xSqesDutZz71hz3eulKmrlKTiEqG3uZ4j25x5GYlOluQ2cj2JxNUXqXD7"},
+                 "NGWL"
+                 {:square-location "LSWNP14T0YKD9",
+                  :location "WL",
+                  :token "EAAAEO2xSqesDutZz71hz3eulKmrlKTiEqG3uZ4j25x5GYlOluQ2cj2JxNUXqXD7"},
+                 "NGWH"
+                 {:square-location "L8XFVAYYK6QGM",
+                  :location "WH",
+                  :token "EAAAEO2xSqesDutZz71hz3eulKmrlKTiEqG3uZ4j25x5GYlOluQ2cj2JxNUXqXD7"},
+                 "NGMJ"
+                 {:square-location "FNH5VRT890WK8",
+                  :location "SC",
+                  :token "EAAAEO2xSqesDutZz71hz3eulKmrlKTiEqG3uZ4j25x5GYlOluQ2cj2JxNUXqXD7"},
+                 "NGBW"
+                 {:square-location "LC3YBEE1P1W2J",
+                  :location "BW",
+                  :token "EAAAEO2xSqesDutZz71hz3eulKmrlKTiEqG3uZ4j25x5GYlOluQ2cj2JxNUXqXD7"}
+                 "NGHG"
+                 {:square-location "LXJCAHYGZVNEJ",
+                  :location "DC",
+                  :token "EAAAEO2xSqesDutZz71hz3eulKmrlKTiEqG3uZ4j25x5GYlOluQ2cj2JxNUXqXD7"},
+                 "NGVZ"
+                 {:square-location "ACNTYY8WVZ6DV",
+                  :location "NP",
+                  :token "EAAAEO2xSqesDutZz71hz3eulKmrlKTiEqG3uZ4j25x5GYlOluQ2cj2JxNUXqXD7"},
+                 "NGVO"
+                 {:square-location "LTGBD7NDCFD36",
+                  :location "VO",
+                  :token "EAAAEO2xSqesDutZz71hz3eulKmrlKTiEqG3uZ4j25x5GYlOluQ2cj2JxNUXqXD7"}
+                 "NGAK"
+                 {:square-location "2RVBYER6QSV7W",
+                  :location "MH",
+                  :token "EAAAEO2xSqesDutZz71hz3eulKmrlKTiEqG3uZ4j25x5GYlOluQ2cj2JxNUXqXD7"},
+                 "NGGH"
+                 {:square-location "LT322EK0S2TRD",
+                  :location "FM",
+                  :token "EAAAEO2xSqesDutZz71hz3eulKmrlKTiEqG3uZ4j25x5GYlOluQ2cj2JxNUXqXD7"}
+                 "NGCD"
+                 {:square-location "L43Z5GMW72VMG",
+                  :location "CD",
+                  :token "EAAAEO2xSqesDutZz71hz3eulKmrlKTiEqG3uZ4j25x5GYlOluQ2cj2JxNUXqXD7"}
+                 "NGSC"
+                 {:square-location "FNH5VRT890WK8",
+                  :location "SC",
+                  :token "EAAAEO2xSqesDutZz71hz3eulKmrlKTiEqG3uZ4j25x5GYlOluQ2cj2JxNUXqXD7"}
+                 "NGFT"
+                 {:square-location "LZDDMFASCHD2K",
+                  :location "FT",
+                  :token "EAAAEO2xSqesDutZz71hz3eulKmrlKTiEqG3uZ4j25x5GYlOluQ2cj2JxNUXqXD7"}
+                 "NGDV"
+                 {:square-location "LRCHF1R2BQPEG",
+                  :location "DV",
+                  :token "EAAAEO2xSqesDutZz71hz3eulKmrlKTiEqG3uZ4j25x5GYlOluQ2cj2JxNUXqXD7"}
+
+                 "NGGL"
+                 {:square-location "LC7ZWEHCFN31B"
+                  :location "GL",
+                  :token "EAAAEO2xSqesDutZz71hz3eulKmrlKTiEqG3uZ4j25x5GYlOluQ2cj2JxNUXqXD7"}
+
+                 ;; "NGGT"
+                 ;; {:square-location "WAITING"
+                 ;; :location "GT",
+                 ;; :token "EAAAEO2xSqesDutZz71hz3eulKmrlKTiEqG3uZ4j25x5GYlOluQ2cj2JxNUXqXD7"}
+
+                 "20TY"
+                 {:square-location "L2579ATQ0X1ET",
+                  :location "WG",
+                  :token "EAAAEEr749Ea6AdPTdngsmUPwIM3ETbPwcx3QQl_NS0KWuIL-JNzAg4f3W9DGQhb"}}}
diff --git a/imagedefinitions.json b/imagedefinitions.json
deleted file mode 100644
index eeb88a2a..00000000
--- a/imagedefinitions.json
+++ /dev/null
@@ -1,6 +0,0 @@
-[
-  {
-    "name": "integreat-app",
-    "imageUri": "679918342773.dkr.ecr.us-east-1.amazonaws.com/integreat"
-  }
-]