diff --git a/.github/workflows/create_and_upload_artifacts.yml b/.github/workflows/create_and_upload_artifacts.yml
deleted file mode 100644
index 79bb904..0000000
--- a/.github/workflows/create_and_upload_artifacts.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-name: Build and upload packages
-
-on:
-  release:
-    types: [published, created, edited]
-
-env:
-  SOURCE_DIR: ./
-  ARTIFACTS_DIR: debian/build/release/
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-      env:
-        DEBIAN_FRONTEND: "noninteractive"
-    - name: Remove github artefacts
-      run: |
-        rm -rf .github/
-    - name: Adjust distibution in changelog file
-      run: |
-        sed -i '0,/restricted/s//stable/' debian/changelog
-    - name: Build Debian package
-      uses: pi-top/action-debian-package@v4
-      with:
-        artifacts_directory: debian/build/release/
-        target_architectures: "amd64,i386"
-    - name: Upload the artifacts
-      uses: skx/github-action-publish-binaries@master
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        args: debian/build/release/*
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3a93437..e1a5be8 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -4,22 +4,28 @@ on:
     tags:
       - 'debian/*' # Push events to matching debian/*, i.e. debian/1.0-2, debian/20.15.10, debian/23.20020326
 
-name: Create Release
+name: Release Process
+
+env:
+  SOURCE_DIR: ./
+  ARTIFACTS_DIR: debian/build/release/
 
 jobs:
-  build:
+  create-release:
     name: Create Release
     runs-on: ubuntu-latest
+    outputs:
+      release-id: ${{ steps.create_release.outputs.id }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
       - name: Install needed packages
         run: |
-          sudo apt-get update && sudo apt-get install -y dpkg-dev
+          if [ $(dpkg -l | grep -c dpkg-dev) -ne 1 ]; then sudo apt-get update && sudo apt-get install -y dpkg-dev; fi
       - name: Gather changelog
         run: |
-          CHANGELOG="$(dpkg-parsechangelog | tail -n +8 > debian/changelog)"
-          echo "${CHANGELOG}"
+          ls -la
+          dpkg-parsechangelog | tail -n +9 > debian.changelog
       - name: Create Release
         id: create_release
         uses: actions/create-release@v1
@@ -28,6 +34,33 @@ jobs:
         with:
           tag_name: ${{ github.ref }}
           release_name: Release ${{ github.ref }}
-          body: ${CHANGELOG}
+          body_path: debian.changelog
           draft: false
           prerelease: false
+
+  build:
+    name: Build and upload packages
+    needs: create-release
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      env:
+        DEBIAN_FRONTEND: "noninteractive"
+    - name: Remove github artefacts
+      run: |
+        rm -rf .github/
+    - name: Adjust distibution in changelog file
+      run: |
+        sed -i '0,/restricted/s//stable/' debian/changelog
+    - name: Build Debian package
+      uses: pi-top/action-debian-package@v4
+      with:
+        artifacts_directory: debian/build/release/
+        target_architectures: "amd64,i386"
+    - name: Upload the artifacts
+      uses: skx/github-action-publish-binaries@master
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        releaseId: ${{ needs.create-release.outputs.release-id }}
+        args: debian/build/release/*