diff --git a/roles/raspberry_pi/defaults/main.yaml b/roles/raspberry_pi/defaults/main.yaml
index b6f491d..d61a4e0 100644
--- a/roles/raspberry_pi/defaults/main.yaml
+++ b/roles/raspberry_pi/defaults/main.yaml
@@ -2,6 +2,6 @@
 raspberry_pi_docker_base: /opt/docker
 raspberry_pi_mosquitto_config_dir: "{{ raspberry_pi_docker_base }}/config/mosquitto"
 raspberry_pi_z2m_config_dir: "{{ raspberry_pi_docker_base }}/config/zigbee2mqtt"
-raspberry_pi_compose_dir: "{{ raspberry_pi_docker_base }}/compose"
+raspberry_pi_compose_dir: "{{ raspberry_pi_docker_base }}/compose/zigbee2mqtt"
 raspberry_pi_mosquitto_version: "2"
 raspberry_pi_z2m_version: "2"
diff --git a/roles/raspberry_pi/templates/zigbee2mqtt/docker-compose.yml.j2 b/roles/raspberry_pi/templates/zigbee2mqtt/docker-compose.yml.j2
index 944470a..5346b73 100644
--- a/roles/raspberry_pi/templates/zigbee2mqtt/docker-compose.yml.j2
+++ b/roles/raspberry_pi/templates/zigbee2mqtt/docker-compose.yml.j2
@@ -18,7 +18,7 @@ services:
     depends_on:
       - mosquitto
     ports:
-      - 8080:8080
+      - 8081:8080
     volumes:
       - {{ raspberry_pi_z2m_config_dir }}/data:/app/data
       - {{ raspberry_pi_z2m_config_dir }}/configuration.yaml:/app/data/configuration.yaml