diff --git a/intern/docker_heimdall/templates/docker-compose.yml b/intern/docker_heimdall/templates/docker-compose.yml
index bb154553c8a61973194676319fe66166ff065551..0159cede96b7a021fe2015185ef977d03a71b8d0 100644
--- a/intern/docker_heimdall/templates/docker-compose.yml
+++ b/intern/docker_heimdall/templates/docker-compose.yml
@@ -13,4 +13,4 @@ services:
     volumes:
       - "{{ basedir }}/config:/config"
     ports:
-      - 80:80
+      - "{{ heimdall_port }}:80"
diff --git a/site.yml b/site.yml
index 0fd55d0e23fc26b9ea58d3623446e0545e9c0639..a5c3e2ebbbb70146ee40af2d81425344912da9ff 100644
--- a/site.yml
+++ b/site.yml
@@ -44,37 +44,38 @@
     - { 
         role: intern/docker_esphome, tags: esphome, 
         servicename: esphome, 
-        basedir: /srv/esphome 
+        basedir: /srv/esphome,
+        esphome_port: 6052 
       }
     - { 
         role: intern/docker_heimdall, tags: heimdall, 
         servicename: heimdall, 
-        basedir: /srv/heimdall 
+        basedir: /srv/heimdall,
+        heimdall_port: 80 
       }
     - { 
-        role: intern/docker_mqtt,   tags: mqtt, 
+        role: intern/docker_mqtt, tags: mqtt, 
         servicename: mqtt,
         basedir: /srv/mqtt, 
         mqtt_port: 1883,
         influxdb_port: 18086
       }
     - { 
-        role: intern/docker_nodered, 
-        tags: nodered, 
+        role: intern/docker_nodered, tags: nodered, 
         servicename: nodered,
         basedir: /srv/nodered,
         nodered_port: 1880
       }
     - { 
-        role: intern/docker_openhab, 
-        tags: openhab, 
+        role: intern/docker_openhab, tags: openhab, 
         servicename: openhab, 
         influxdb_port: 28086
       }
     - { 
-        role: intern/docker_unifi, 
-        tags: unifi, 
-        servicename: unifi 
+        role: intern/docker_unifi, tags: unifi, 
+        servicename: unifi,
+        unifi_port1: 8080,
+        unifi_port2: 8443  
       }