diff --git a/docker-compose.metamigo-postgresql.yml b/docker-compose.metamigo-postgresql.yml
index 1e8086e..5834fc4 100644
--- a/docker-compose.metamigo-postgresql.yml
+++ b/docker-compose.metamigo-postgresql.yml
@@ -1,7 +1,12 @@
 version: "3.4"
 
+x-global-vars:
+  &common-global-variables
+  TZ: Etc/UTC
+
 x-metamigo-vars:
   &common-metamigo-variables
+  <<: *common-global-variables
   DATABASE_HOST: "metamigo-postgresql"
   DATABASE_NAME: "metamigo"
   DATABASE_ROOT_OWNER: "root"
@@ -48,6 +53,17 @@ services:
     ports:
       - 127.0.0.1:5433:5432
 
+  signald:
+    container_name: signald
+    build: ./docker/signald
+    image: registry.gitlab.com/digiresilience/link/link-stack/signald:${LINK_STACK_VERSION}
+    restart: ${RESTART}
+    user: ${CURRENT_UID}
+    volumes:
+      - ./signald-state:/signald
+    environment:
+      <<: *common-global-variables
+
 volumes:
   metamigo-data:
     driver: local
diff --git a/docker-compose.metamigo.yml b/docker-compose.metamigo.yml
index ea4952c..4bee18b 100644
--- a/docker-compose.metamigo.yml
+++ b/docker-compose.metamigo.yml
@@ -6,6 +6,7 @@ x-global-vars:
 
 x-metamigo-vars:
   &common-metamigo-variables
+  <<: *common-global-variables
   DATABASE_HOST: "metamigo-postgresql"
   DATABASE_NAME: "metamigo"
   DATABASE_ROOT_OWNER: "root"
@@ -87,14 +88,3 @@ services:
     depends_on:
       - metamigo-api
 
-  signald:
-    container_name: signald
-    build: ./docker/signald
-    image: registry.gitlab.com/digiresilience/link/link-stack/signald:${LINK_STACK_VERSION}
-    restart: ${RESTART}
-    user: ${CURRENT_UID}
-    volumes:
-      - ./signald-state:/signald
-    environment:
-      <<: *common-global-variables
-