diff --git a/ansible/roles/signage_player/tasks/main.yml b/ansible/roles/signage_player/tasks/main.yml
index ac83a70..2c7f66f 100644
--- a/ansible/roles/signage_player/tasks/main.yml
+++ b/ansible/roles/signage_player/tasks/main.yml
@@ -17,6 +17,15 @@
     state: present
   become: true
 
+- name: Install screenshot tools for morz-agent
+  ansible.builtin.apt:
+    name:
+      - scrot
+      - imagemagick
+      - x11-apps
+    state: present
+  become: true
+
 - name: Ensure config directory exists
   ansible.builtin.file:
     path: "{{ signage_config_dir }}"
diff --git a/compose/server-stack.yml b/compose/server-stack.yml
index d5d2d55..fbf615e 100644
--- a/compose/server-stack.yml
+++ b/compose/server-stack.yml
@@ -32,7 +32,9 @@ services:
       MORZ_INFOBOARD_HTTP_ADDR: ":8080"
       MORZ_INFOBOARD_DATABASE_URL: "postgres://morz_infoboard:morz_infoboard@postgres:5432/morz_infoboard?sslmode=disable"
       MORZ_INFOBOARD_UPLOAD_DIR: "/uploads"
-      MORZ_INFOBOARD_MQTT_BROKER: "tcp://mosquitto:1883"
+      MORZ_INFOBOARD_MQTT_BROKER: "${MORZ_INFOBOARD_MQTT_BROKER}"
+      MORZ_INFOBOARD_MQTT_USERNAME: "${MORZ_INFOBOARD_MQTT_USERNAME}"
+      MORZ_INFOBOARD_MQTT_PASSWORD: "${MORZ_INFOBOARD_MQTT_PASSWORD}"
       MORZ_INFOBOARD_ADMIN_PASSWORD: "${MORZ_INFOBOARD_ADMIN_PASSWORD}"
       MORZ_INFOBOARD_DEV_MODE: "${MORZ_INFOBOARD_DEV_MODE:-false}"
       TZ: "Europe/Berlin"