diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index edb70d66fe0..31562249017 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -59,4 +59,28 @@ jobs:
         run: |
           cd ui
           npm ci --prefer-offline --cache ~/.npm
-          node_modules/@angular/cli/bin/ng build -c "openems,openems-edge-prod,prod"
\ No newline at end of file
+          node_modules/@angular/cli/bin/ng build -c "openems,openems-edge-prod,prod"
+
+      #
+      # Is this a Tag? Prepare release assets and create a draft release
+      #
+      - name: Prepare Edge+Backend assets
+        if: startsWith(github.ref, 'refs/tags/')
+        run: |
+          ./gradlew buildEdge buildBackend
+
+      - name: Prepare UI asset
+        if: startsWith(github.ref, 'refs/tags/')
+        uses: edgarrc/action-7z@v1
+        with:
+          args: 7z a openems-ui.zip ./ui/target/*
+
+      - name: Create draft Release
+        if: startsWith(github.ref, 'refs/tags/')
+        uses: softprops/action-gh-release@v1
+        with:
+          draft: true
+          files: |
+            build/openems-edge.jar
+            build/openems-backend.jar
+            openems-ui.zip
\ No newline at end of file