diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml
index e45fd4f77d..5972ff3124 100644
--- a/.github/workflows/nightly.yaml
+++ b/.github/workflows/nightly.yaml
@@ -22,6 +22,10 @@ jobs:
           cd web
           npm ci --prefer-offline --no-audit
           npm run-script build
+      - uses: actions/upload-artifact@v2
+        with:
+          name: bundle
+          path: web/dist
         shell: bash
       - name: Build electron binary
         env:
@@ -49,6 +53,10 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
+      - uses: actions/download-artifact@v2
+        with:
+          name: bundle
+          path: web/dist
       - name: Run goreleaser
         run: |
           git fetch --tags
diff --git a/.github/workflows/preflight-checks.yaml b/.github/workflows/preflight-checks.yaml
index f88d1ea12a..733f5fef05 100644
--- a/.github/workflows/preflight-checks.yaml
+++ b/.github/workflows/preflight-checks.yaml
@@ -92,6 +92,10 @@ jobs:
           npm ci --prefer-offline --no-audit
           npm run-script build
         shell: bash
+      - uses: actions/upload-artifact@v2
+        with:
+          name: bundle
+          path: web/dist
       - name: Go tools
         env:
           GOFLAGS: -mod=vendor
@@ -133,6 +137,10 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
+      - uses: actions/download-artifact@v2
+        with:
+          name: bundle
+          path: web/dist
       - name: Run GoReleaser
         run: |
           goreleaser --skip-publish
diff --git a/.goreleaser-nightly.yml b/.goreleaser-nightly.yml
index 9eb4bfa613..d9c739e697 100644
--- a/.goreleaser-nightly.yml
+++ b/.goreleaser-nightly.yml
@@ -13,6 +13,8 @@ builds:
       - linux
     goarch:
       - amd64
+    flags:
+      - -tags=embedded
     ldflags: -X "main.buildTime={{.Date}}" -X "main.gitCommit={{.Commit}}"
 nfpms:
   -
diff --git a/.goreleaser.yml b/.goreleaser.yml
index d50cc5ac7b..51cc24529e 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -16,6 +16,8 @@ builds:
       - amd64
       - arm
       - arm64
+    flags:
+      - -tags=embedded
     ldflags: -X "main.buildTime={{.Date}}" -X "main.gitCommit={{.Commit}}" -X "main.version={{.Version}}"
 nfpms:
   -