diff --git a/docker-swag/docker-compose.yml b/docker-swag/docker-compose.yml
index 02815e4..cec254e 100644
--- a/docker-swag/docker-compose.yml
+++ b/docker-swag/docker-compose.yml
@@ -17,8 +17,8 @@ services:
     volumes:
       - swag_conf_update:/config
     ports:
-      - 443:443
-      - 80:80
+      - 444:443
+      - 81:80
     restart: unless-stopped
     networks:
       - nginx_network
diff --git a/fhem/docker-compose.yml b/fhem/docker-compose.yml
index 67e6f3b..f54f6f8 100644
--- a/fhem/docker-compose.yml
+++ b/fhem/docker-compose.yml
@@ -7,19 +7,11 @@ services:
   fhem:
     image: fhem/fhem:latest
     container_name: fhem
-    restart: always
-    ports:
-      - "8083:8083"
-      - "7072:7072"
-      - "8090:8090"
+    restart: unless-stopped    
     volumes:
       - fhem_opt:/opt/fhem/
     environment:
       TELNETPORT: 7072
       TZ: Europe/Berlin
-    networks:
-      - nginx_network
-            
-networks:
-  nginx_network:
-    driver: bridge
\ No newline at end of file
+    network_mode: host
+            
\ No newline at end of file
diff --git a/homeassistant/docker-compose.yaml b/homeassistant/docker-compose.yaml
new file mode 100644
index 0000000..2969ab5
--- /dev/null
+++ b/homeassistant/docker-compose.yaml
@@ -0,0 +1,11 @@
+version: '3'
+services:
+  homeassistant:
+    container_name: homeassistant
+    image: "ghcr.io/home-assistant/home-assistant:stable"
+    volumes:
+      - /PATH_TO_YOUR_CONFIG:/config
+      - /etc/localtime:/etc/localtime:ro
+    restart: unless-stopped
+    privileged: true
+    network_mode: host
diff --git a/mosquitto/docker-compose.yml b/mosquitto/docker-compose.yml
index 2b65c29..84147c0 100644
--- a/mosquitto/docker-compose.yml
+++ b/mosquitto/docker-compose.yml
@@ -10,7 +10,7 @@ services:
       - "1884:1884"
       - "9001:9001"
     volumes:
-      - D:\dev\docker\docker-compose\mosquitto\mosquitto.conf:/mosquitto/config/mosquitto.conf
+      - ./mosquitto.conf:/mosquitto/config/mosquitto.conf
       - mosquitto_data:/mosquitto/data 
       - mosquitto_log:/mosquitto/log
     restart: always
@@ -19,4 +19,4 @@ services:
 volumes:
   mosquitto_data:
   mosquitto_log:
-   
\ No newline at end of file
+   
diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml
index bce037e..bef5c4e 100644
--- a/nextcloud/docker-compose.yml
+++ b/nextcloud/docker-compose.yml
@@ -24,7 +24,7 @@ services:
     container_name: nextcloud
     restart: always
     ports:
-      - 8080:80
+      - 8082:80
     links:
       - nextcloud_db
     volumes:
diff --git a/node-red/docker-compose.yaml b/node-red/docker-compose.yaml
new file mode 100644
index 0000000..81dbcb8
--- /dev/null
+++ b/node-red/docker-compose.yaml
@@ -0,0 +1,20 @@
+################################################################################
+# Node-RED Stack or Compose
+################################################################################
+# docker stack deploy node-red --compose-file docker-compose-node-red.yml
+# docker-compose -f docker-compose-node-red.yml -p myNoderedProject up
+################################################################################
+version: "3.7"
+
+services:
+  node-red:
+    image: nodered/node-red:latest
+    environment:
+      - TZ=Europe/Amsterdam
+    volumes:
+      - node-red-data:/data
+    restart: unless-stopped
+    network_mode: host
+
+volumes:
+  node-red-data:
diff --git a/octoprint/docker-compose.yaml b/octoprint/docker-compose.yaml
new file mode 100644
index 0000000..acf7087
--- /dev/null
+++ b/octoprint/docker-compose.yaml
@@ -0,0 +1,40 @@
+version: '2.4'
+
+services:
+  octoprint:
+    image: octoprint/octoprint
+    restart: unless-stopped
+    ports:
+      - 8088:80
+    # devices:
+    # use `python -m serial.tools.miniterm` to see what the name is of the printer, this requires pyserial
+    #  - /dev/ttyACM0:/dev/ttyACM0
+    #  - /dev/video0:/dev/video0
+    volumes:
+     - octoprint:/octoprint
+    # uncomment the lines below to ensure camera streaming is enabled when
+    # you add a video device
+    #environment:
+    #  - ENABLE_MJPG_STREAMER=true
+  
+  ####
+  # uncomment if you wish to edit the configuration files of octoprint
+  # refer to docs on configuration editing for more information
+  ####
+
+  #config-editor:
+  #  image: linuxserver/code-server
+  #  ports:
+  #    - 8443:8443
+  #  depends_on:
+  #    - octoprint
+  #  restart: unless-stopped
+  #  environment:
+  #    - PUID=0
+  #    - GUID=0
+  #    - TZ=America/Chicago
+  #  volumes:
+  #    - octoprint:/octoprint
+
+volumes:
+  octoprint:
\ No newline at end of file