diff --git a/hasura/metadata/cron_triggers.yaml b/hasura/metadata/cron_triggers.yaml
index 2c8c4c91d..845cb60f6 100644
--- a/hasura/metadata/cron_triggers.yaml
+++ b/hasura/metadata/cron_triggers.yaml
@@ -24,6 +24,15 @@
     - name: x-imex-auth
       value_from_env: DATAPUMP_AUTH
   comment: Project Mexico
+- name: Chatter API Data Pump
+  webhook: '{{HASURA_API_URL}}/data/chatter-api'
+  schedule: 45 4 * * *
+  include_in_metadata: true
+  payload: {}
+  headers:
+    - name: x-imex-auth
+      value_from_env: DATAPUMP_AUTH
+  comment: ""
 - name: Chatter Data Pump
   webhook: '{{HASURA_API_URL}}/data/chatter'
   schedule: 45 5 * * *
diff --git a/localstack/init/10-bootstrap.sh b/localstack/init/10-bootstrap.sh
index ee8183d1e..72a18528a 100755
--- a/localstack/init/10-bootstrap.sh
+++ b/localstack/init/10-bootstrap.sh
@@ -51,7 +51,8 @@ awslocal ses verify-email-identity --email-address noreply@imex.online --region
 
 # Secrets
 ensure_secret_file "CHATTER_PRIVATE_KEY" "/tmp/certs/io-ftp-test.key"
-ensure_secret_string "CHATTER_COMPANY_KEY_6713" "${CHATTER_COMPANY_KEY_6713:-REPLACE_ME}"
+ensure_secret_string "CHATTER_COMPANY_KEY_6713" "${CHATTER_COMPANY_KEY_6713}"
+ensure_secret_string "CHATTER_COMPANY_KEY_6746" "${CHATTER_COMPANY_KEY_6746}"
 
 # Logs
 ensure_log_group "development"
diff --git a/server/chatter/createLocation.js b/server/chatter/createLocation.js
index 46766dcf8..18c51305f 100644
--- a/server/chatter/createLocation.js
+++ b/server/chatter/createLocation.js
@@ -67,7 +67,7 @@ const createLocation = async (req, res) => {
 
     const chatterApi = await createChatterClient(DEFAULT_COMPANY_ID);
 
-    const locationIdentifier = `${DEFAULT_COMPANY_ID}-${bodyshop.id}`;
+    const locationIdentifier = bodyshop?.imexshopid ?? `${DEFAULT_COMPANY_ID}-${bodyshop.id}`;
 
     const locationPayload = {
       name: bodyshop.shopname,