diff --git a/homenetwork/nas/frigate.yml b/homenetwork/nas/frigate.yml
new file mode 100644
index 0000000..9a98cdc
--- /dev/null
+++ b/homenetwork/nas/frigate.yml
@@ -0,0 +1,28 @@
+version: "3.9"
+services:
+  frigate:
+    container_name: frigate
+    restart: unless-stopped
+    image: ghcr.io/blakeblackshear/frigate:stable
+    shm_size: "64mb" # update for your cameras based on calculation above
+    devices:
+      - /dev/bus/usb:/dev/bus/usb # Passes the USB Coral, needs to be modified for other versions
+#      - /dev/apex_0:/dev/apex_0 # Passes a PCIe Coral, follow driver instructions here https://coral.ai/docs/m2/get-started/#2a-on-linux
+#      - /dev/video11:/dev/video11 # For Raspberry Pi 4B
+      - /dev/dri/renderD128:/dev/dri/renderD128 # For intel hwaccel, needs to be updated for your hardware
+    volumes:
+      - /etc/localtime:/etc/localtime:ro
+      - /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/docker_config/frigate/config:/config
+      - /srv/dev-disk-by-uuid-7a33692e-6462-435b-9c97-029589baeeab/frigate/:/media/frigate
+      - type: tmpfs # Optional: 1GB of memory, reduces SSD/SD Card wear
+        target: /tmp/cache
+        tmpfs:
+          size: 1000000000
+    ports:
+      - "8971:8971"
+      - "5005:5000" # Internal unauthenticated access. Expose carefully.
+      - "8554:8554" # RTSP feeds
+      - "8555:8555/tcp" # WebRTC over tcp
+      - "8555:8555/udp" # WebRTC over udp
+    environment:
+      FRIGATE_RTSP_PASSWORD: "password"
diff --git a/homenetwork/nas/homeassistant.yml b/homenetwork/nas/homeassistant.yml
new file mode 100644
index 0000000..145bae4
--- /dev/null
+++ b/homenetwork/nas/homeassistant.yml
@@ -0,0 +1,11 @@
+services:
+  homeassistant:
+    container_name: homeassistant
+    image: "ghcr.io/home-assistant/home-assistant:stable"
+    volumes:
+      - /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/docker_config/homeassistant/config:/config
+      - /etc/localtime:/etc/localtime:ro
+      - /run/dbus:/run/dbus:ro
+    restart: unless-stopped
+    privileged: true
+    network_mode: host
diff --git a/homenetwork/nas/nextcloud/docker-compose.yml b/homenetwork/nas/nextcloud/docker-compose.yml
index e923381..64ea1f2 100644
--- a/homenetwork/nas/nextcloud/docker-compose.yml
+++ b/homenetwork/nas/nextcloud/docker-compose.yml
@@ -81,6 +81,7 @@ services:
     environment:
       - password=password 
       - username=nextcloud
+      - domain=vbchaos.nl
       - extra_params=--o:ssl.enable=true
     ports:
       - 9980:9980
diff --git a/homenetwork/nas/openvpn.sh b/homenetwork/nas/openvpn.sh
index 7cffd65..ebba12d 100755
--- a/homenetwork/nas/openvpn.sh
+++ b/homenetwork/nas/openvpn.sh
@@ -6,7 +6,7 @@ docker volume create --opt type=none --opt o=bind --opt device=/srv/dev-disk-by-
 docker run -v $OVPN_DATA:/etc/openvpn --rm kylemanna/openvpn ovpn_genconfig -u udp://vpn.vbchaos.nl
 docker run -v $OVPN_DATA:/etc/openvpn --rm -it kylemanna/openvpn ovpn_initpki
 
-docker run -v $OVPN_DATA:/etc/openvpn -d -p 1194:1194/udp --name OpenVPN --cap-add=NET_ADMIN kylemanna/openvpn
+docker run -v $OVPN_DATA:/etc/openvpn -d -p 1194:1194/udp --name OpenVPN --cap-add=NET_ADMIN --device=/dev/net/tun kylemanna/openvpn
 
 docker run -v $OVPN_DATA:/etc/openvpn --rm -it kylemanna/openvpn easyrsa build-client-full $CLIENTNAME nopass
 
diff --git a/homenetwork/nas/swag.yml b/homenetwork/nas/swag.yml
index 418630c..a8353c7 100644
--- a/homenetwork/nas/swag.yml
+++ b/homenetwork/nas/swag.yml
@@ -12,7 +12,7 @@ services:
       - TZ=Etc/UTC
       - URL=vbchaos.nl
       - VALIDATION=http
-      - SUBDOMAINS=nc,esp,git,grafana,registry,registrybrowser,svn,vpn,vaultwarden
+      - SUBDOMAINS=nc,esp,git,grafana,registry,registrybrowser,svn,vpn,vaultwarden,collabora
       - CERTPROVIDER= #optional
       - DNSPLUGIN=cloudflare #optional
       - PROPAGATION= #optional