diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8c0f0eb1a..0425f13fa 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -58,6 +58,19 @@ jobs:
       run: |
         pio upgrade
 
+    - name: Pull web ui
+      uses: dsaltares/fetch-gh-release-asset@master
+      with:
+        repo: "meshtastic/meshtastic-web"
+        file: "build.tar"
+        target: "build.tar"
+        token: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Unpack web ui
+      run: |
+        tar -xf build.tar -C data/static
+        rm build.tar
+
     # We now run integration test before other build steps (to quickly see runtime failures)
     - name: Build for native
       run: platformio run -e native
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3403a145d..7e4e259a6 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -47,6 +47,19 @@ jobs:
       run: |
         pio upgrade
 
+    - name: Pull web ui
+      uses: dsaltares/fetch-gh-release-asset@master
+      with:
+        repo: "meshtastic/meshtastic-web"
+        file: "build.tar"
+        target: "build.tar"
+        token: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Unpack web ui
+      run: |
+        tar -xf build.tar -C data/static
+        rm build.tar
+
     # Will be available in steps.version.outputs.version
     - name: Get version string
       run: echo "::set-output name=version::$(./bin/buildinfo.py long)"
diff --git a/data/static/.gitkeep b/data/static/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/data/static/index.html b/data/static/index.html
deleted file mode 100644
index 9297288c7..000000000
--- a/data/static/index.html
+++ /dev/null
@@ -1 +0,0 @@
-not yet supported - soon will be included in build