diff --git a/main.sh b/main.sh
index 0609cf3..6fb52ff 100755
--- a/main.sh
+++ b/main.sh
@@ -12,5 +12,11 @@ cd ./hwdata
 # Get build deps
 apt-get build-dep ./ -y
 
-# Build binaries
-echo -ne 'y'  | debuild -us -uc
+# Build package
+dh_make --createorig
+dpkg-buildpackage
+
+# Move the debs to output
+cd ../
+mkdir -p ./output
+mv ./*.deb ./output/
diff --git a/release.sh b/release.sh
index a900a64..7528ba2 100755
--- a/release.sh
+++ b/release.sh
@@ -2,7 +2,7 @@
 dpkg-sig --sign builder ./output/hwdata*.deb
 
 # Pull down existing ppa repo db files etc
-rsync -azP --exclude '*.deb' ferreo@pika-os.com:/srv/www/pikappa/ ./output/repo
+rsync -azP --exclude '*.deb' ferreo@direct.pika-os.com:/srv/www/pikappa/ ./output/repo
 
 # Remove our existing package from the repo
 reprepro -V --basedir ./output/repo/ removefilter kinetic 'Package (% hwdata*)'
@@ -11,4 +11,4 @@ reprepro -V --basedir ./output/repo/ removefilter kinetic 'Package (% hwdata*)'
 reprepro -V --basedir ./output/repo/ includedeb kinetic ./output/hwdata*.deb
 
 # Push the updated ppa repo to the server
-rsync -azP ./output/repo/ ferreo@pika-os.com:/srv/www/pikappa/
+rsync -azP ./output/repo/ ferreo@direct.pika-os.com:/srv/www/pikappa/