diff --git a/.github/workflows/build-and-upload.yml b/.github/workflows/build-and-upload.yml
index 12799cd..807ee2a 100644
--- a/.github/workflows/build-and-upload.yml
+++ b/.github/workflows/build-and-upload.yml
@@ -16,7 +16,7 @@ jobs:
     - name: Install Dependencies
       run: |
         sudo apt-get update
-        sudo apt-get install -y build-essential libssl-dev libcurl4-openssl-dev libjson-c-dev cmake devscripts dpkg-dev gnupg
+        sudo apt-get install -y build-essential libssl-dev libcurl4-openssl-dev libjson-c-dev cmake devscripts dpkg-dev gnupg lintian
 
     - name: Build HSM Engine
       run: |
@@ -41,25 +41,11 @@ jobs:
       run: |
         cd src/build
         make install DESTDIR=~/hsm-engine-deb
-        cd ~
-        dpkg-deb --build ~/hsm-engine-deb hsm-engine_1.0-1_amd64.deb
 
-    - name: Create debian directory and changelog
-      run: |
-        mkdir -p ~/hsm-engine-deb/debian
-        echo "hsm-engine (1.0-1) unstable; urgency=low" > ~/hsm-engine-deb/debian/changelog
-        echo "" >> ~/hsm-engine-deb/debian/changelog
-        echo "  * Initial release" >> ~/hsm-engine-deb/debian/changelog
-        echo "" >> ~/hsm-engine-deb/debian/changelog
-        echo " -- Andrey V <andrey@kima.finance>  $(date -R)" >> ~/hsm-engine-deb/debian/changelog
-
-    - name: Generate .changes File
+    - name: Build Source Package
       run: |
         cd ~/hsm-engine-deb
-        dpkg-gencontrol
-        cd ~
-        dpkg-deb --build hsm-engine-deb
-        dpkg-genchanges > hsm-engine_1.0-1_amd64.changes
+        debuild -S -sa
 
     - name: Sign and Upload to PPA
       env:
@@ -71,4 +57,4 @@ jobs:
         echo "passphrase=${GPG_PASSPHRASE}" > ~/.gnupg/gpg.conf
         echo "use-agent" >> ~/.gnupg/gpg.conf
         debsign --re-sign -k${{ secrets.GPG_KEY_ID }} hsm-engine_1.0-1_amd64.changes
-        dput ppa:andrey-vin/kima-hsm-ppa hsm-engine_1.0-1_amd64.changes
+        dput ppa:${{ secrets.LAUNCHPAD_USERNAME }}/kima-hsm-ppa hsm-engine_1.0-1_amd64.changes