diff --git a/Cargo.toml b/Cargo.toml
index 0131571..6d27a76 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -38,6 +38,6 @@ depends = "libX11"
 
 [package.metadata.generate-rpm]
 assets = [
-    { source = "target/release/pwsp", dest = "/usr/bin/pwsp", mode = "755" },
+    { source = "target/x86_64-unknown-linux-gnu/release/pwsp", dest = "/usr/bin/pwsp", mode = "755" },
     { source = "pwsp.desktop", dest = "/usr/share/applications/pwsp.desktop", mode = "644" }
 ]
\ No newline at end of file
diff --git a/build.sh b/build.sh
deleted file mode 100644
index bd1fe10..0000000
--- a/build.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/sh
-
-rustup target add x86_64-unknown-linux-gnu
-cargo build --release --target x86_64-unknown-linux-gnu
\ No newline at end of file
diff --git a/build_all.sh b/build_all.sh
deleted file mode 100644
index 490dcc7..0000000
--- a/build_all.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/sh
-
-sh ./build_deb.sh
-sh ./build_rpm.sh
\ No newline at end of file
diff --git a/build_deb.sh b/build_deb.sh
deleted file mode 100644
index 6cb1b78..0000000
--- a/build_deb.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/sh
-
-sh ./build.sh
-cargo install cargo-deb
-cargo deb
\ No newline at end of file
diff --git a/build_rpm.sh b/build_rpm.sh
deleted file mode 100644
index a825452..0000000
--- a/build_rpm.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/sh
-
-sh ./build.sh
-cargo install cargo-generate-rpm
-cargo generate-rpm
\ No newline at end of file
diff --git a/build_scripts/build.sh b/build_scripts/build.sh
new file mode 100644
index 0000000..f9492ea
--- /dev/null
+++ b/build_scripts/build.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/bash
+
+# Change dir to the cargo project
+cd "$(dirname "$(realpath "$0")")/.." || exit
+
+RUST_TARGET=${1:-"x86_64-unknown-linux-gnu"}
+
+rustup target add "$RUST_TARGET"
+cargo build --release --target "$RUST_TARGET"
\ No newline at end of file
diff --git a/build_scripts/build_all.sh b/build_scripts/build_all.sh
new file mode 100644
index 0000000..2d95073
--- /dev/null
+++ b/build_scripts/build_all.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/bash
+
+# Change dir to the cargo project
+cd "$(dirname "$(realpath "$0")")/.." || exit
+
+RUST_TARGET="x86_64-unknown-linux-gnu"
+
+# Build all packages
+bash ./build_scripts/build_deb.sh "$RUST_TARGET"
+bash ./build_scripts/build_rpm.sh "$RUST_TARGET"
+
+# Move .deb and .rpm packages to for_github_release directory
+mkdir ./target/for_github_release
+cp "$(find ./target/$RUST_TARGET/debian/pwsp_*_amd64.deb | sort -V | tail -n 1)" ./target/for_github_release/
+cp "$(find ./target/generate-rpm/pwsp-*.x86_64.rpm | sort -V | tail -n 1)" ./target/for_github_release/
+
+# Compress binaries using upx (if upx is installed)
+if command -v upx >/dev/null 2>&1; then
+  upx --best ./target/$RUST_TARGET/release/pwsp
+  upx -t ./target/$RUST_TARGET/release/pwsp
+fi
+
+# Move binaries to for_github_release directory
+cp ./target/$RUST_TARGET/release/pwsp ./target/for_github_release/pwsp-x86_64-linux-gnu
diff --git a/build_scripts/build_deb.sh b/build_scripts/build_deb.sh
new file mode 100644
index 0000000..6e9c7b1
--- /dev/null
+++ b/build_scripts/build_deb.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/bash
+
+# Change dir to the cargo project
+cd "$(dirname "$(realpath "$0")")/.." || exit
+
+RUST_TARGET=${1:-"x86_64-unknown-linux-gnu"}
+
+bash ./build_scripts/build.sh "$RUST_TARGET"
+cargo install cargo-deb
+cargo deb --target "$RUST_TARGET"
\ No newline at end of file
diff --git a/build_scripts/build_rpm.sh b/build_scripts/build_rpm.sh
new file mode 100644
index 0000000..0233fed
--- /dev/null
+++ b/build_scripts/build_rpm.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/bash
+
+# Change dir to the cargo project
+cd "$(dirname "$(realpath "$0")")/.." || exit
+
+RUST_TARGET=${1:-"x86_64-unknown-linux-gnu"}
+
+bash ./build_scripts/build.sh "$RUST_TARGET"
+cargo install cargo-generate-rpm
+cargo generate-rpm
\ No newline at end of file