diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index ea8bcc7c..6c467e5b 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -8,8 +8,17 @@
     "41000": {
       "label": "Rollup",
       "onAutoForward": "silent"
+    },
+    "hass:8123": {
+      "label": "Home Assistant",
+      "onAutoForward": "silent"
+    },
+    "frigate:5000": {
+      "label": "Frigate",
+      "onAutoForward": "silent"
     }
   },
+  "forwardPorts": ["hass:8123", "frigate:5000"],
   "initializeCommand": ".devcontainer/initialize.sh",
   "postCreateCommand": "yarn install",
   "extensions": [
diff --git a/.devcontainer/frigate-hass-integration b/.devcontainer/frigate-hass-integration
index dd90e2a4..16bd40d6 160000
--- a/.devcontainer/frigate-hass-integration
+++ b/.devcontainer/frigate-hass-integration
@@ -1 +1 @@
-Subproject commit dd90e2a412c46d42e076a4dc802435a077f07723
+Subproject commit 16bd40d6226150265edd3019f85a23e8e9e2ba01
diff --git a/.devcontainer/initialize.sh b/.devcontainer/initialize.sh
index 0cddc959..c908909b 100755
--- a/.devcontainer/initialize.sh
+++ b/.devcontainer/initialize.sh
@@ -1,18 +1,7 @@
 #!/bin/bash
 
-set -euo pipefail
-
-readonly wanted_line_key="LOCAL_WORKSPACE_FOLDER"
-readonly wanted_line="${wanted_line_key}='${PWD}'"
-readonly file=".env"
-
-echo "Writing ${wanted_line} to ${file}" >&2
-if [[ -f "${file}" ]] && grep --quiet "^${wanted_line_key}=" "${file}"; then
-    sed --in-place "s,^${wanted_line_key}=.*,${wanted_line}," "${file}"
-else
-    echo "${wanted_line}" >>"${file}"
-fi
-
-set -x
+set -euxo pipefail
 
 git submodule update --init
+
+.devcontainer/frigate-hass-integration/.devcontainer/set_dot_env.sh
diff --git a/docker-compose.yml b/docker-compose.yml
index 5a38fa8b..3940d253 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,9 +5,6 @@ services:
     user: node
     init: true
     build: .devcontainer
-    ports:
-      # Rollup
-      - 41000:41000
     env_file:
       - .env
     volumes: