diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
deleted file mode 100644
index 09839a27..00000000
--- a/.github/workflows/release.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-# SPDX-FileCopyrightText: 2025 Lennart Dohmann <lennart.dohmann@gdata.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
-name: Release App
-
-on: 
-  push:
-    tags: ["*"]
-
-jobs:
-  release:
-    runs-on: ubuntu-latest
-    if: startsWith(github.ref, 'refs/tags/')
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/download-artifact@master
-        with:
-          name: build-dir
-          path: build/
-
-      - name: write version to output
-        id: write-version-to-output
-        run: |
-          RELEASE_VERSION=${GITHUB_REF#refs/tags/}
-          echo "RELEASE_VERSION=$RELEASE_VERSION" >> $GITHUB_OUTPUT
-
-      - name: Github Release
-        uses: softprops/action-gh-release@v2
-        with:
-          files: build/artifacts/*
-
-      - name: Attach tarball to github release
-        uses: svenstaro/upload-release-action@v2
-        id: attach_to_release
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ./build/artifacts/gdatavaas.tar.gz
-          asset_name: gdatavaas.tar.gz
-          tag: ${{ github.ref }}
-          overwrite: true
-
-      - name: Upload app to Nextcloud appstore
-        uses: nextcloud-releases/nextcloud-appstore-push-action@v1
-        with:
-          app_name: gdatavaas
-          appstore_token: ${{ secrets.VAAS_APPSTORE_TOKEN }}
-          download_url: ${{ steps.attach_to_release.outputs.browser_download_url }}
-          app_private_key: ${{ secrets.VAAS_NEXTCLOUD_KEY }}
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index bfe1ed51..c2f04d42 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -102,3 +102,46 @@ jobs:
         with:
           name: build-dir
           path: build/
+
+  release:
+    needs:
+      - tests
+      - build-devcontainer
+    runs-on: ubuntu-latest
+    if: startsWith(github.ref, 'refs/tags/')
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/download-artifact@master
+        with:
+          name: build-dir
+          path: build/
+
+      - name: write version to output
+        id: write-version-to-output
+        run: |
+          RELEASE_VERSION=${GITHUB_REF#refs/tags/}
+          echo "RELEASE_VERSION=$RELEASE_VERSION" >> $GITHUB_OUTPUT
+
+      - name: Github Release
+        uses: softprops/action-gh-release@v2
+        with:
+          files: build/artifacts/*
+
+      - name: Attach tarball to github release
+        uses: svenstaro/upload-release-action@v2
+        id: attach_to_release
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: ./build/artifacts/gdatavaas.tar.gz
+          asset_name: gdatavaas.tar.gz
+          tag: ${{ github.ref }}
+          overwrite: true
+
+      - name: Upload app to Nextcloud appstore
+        uses: nextcloud-releases/nextcloud-appstore-push-action@v1
+        with:
+          app_name: gdatavaas
+          appstore_token: ${{ secrets.VAAS_APPSTORE_TOKEN }}
+          download_url: ${{ steps.attach_to_release.outputs.browser_download_url }}
+          app_private_key: ${{ secrets.VAAS_NEXTCLOUD_KEY }}