diff --git a/build.py b/build.py
index fa94257..569df6c 100644
--- a/build.py
+++ b/build.py
@@ -16,7 +16,7 @@ PACKAGE_FILE = f"/tmp/{PACKAGE_NAME}/package.toml"
 package = toml.load(PACKAGE_FILE)
 print(
     huepy.run(
-        f'Building {PACKAGE_NAME} v{package["version"]}-{package["build_number"]}'
+        f'Building {PACKAGE_NAME} v{package["version"]}_{package["build_number"]}-{package["aur_build"]}'
     )
 )
 
@@ -90,7 +90,7 @@ else:
     pkgbuild_template = env.get_template("PKGBUILD")
 pkgbuild = pkgbuild_template.render(**package)
 
-build_path = BUILDS_PATH / Path("{version}-{build_number}".format(**package))
+build_path = BUILDS_PATH / Path("{version}_{build_number}-{aur_build}".format(**package))
 os.makedirs(build_path, exist_ok=True)
 
 print(huepy.info(f"Writing PKGBUILD file..."))
diff --git a/templates/PKGBUILD.base.j2 b/templates/PKGBUILD.base.j2
index a53c777..643460c 100644
--- a/templates/PKGBUILD.base.j2
+++ b/templates/PKGBUILD.base.j2
@@ -1,8 +1,8 @@
 # Maintainer: Felipe Martin <me@fmartingr.com>
 
 pkgname="{{ name }}"
-pkgver="{{ version }}"
-pkgrel="{{ build_number }}"
+pkgver="{{ version }}_{{ build_number }}"
+pkgrel="{{ aur_build }}"
 pkgdesc="{{ description }}"
 arch=('{{ arch|join("' '") }}')
 url="{{ url }}"
diff --git a/templates/PKGBUILD.debian.j2 b/templates/PKGBUILD.debian.j2
index 792d601..da3b3e3 100644
--- a/templates/PKGBUILD.debian.j2
+++ b/templates/PKGBUILD.debian.j2
@@ -1,16 +1,10 @@
 {% extends "PKGBUILD.base.j2" %}
 
 {% block operations %}
-prepare() {
-	cd "$srcdir"
-	mkdir -p data
-	ar x {{ name }}-*
-	xz -d data.tar.xz
-	tar xf data.tar --directory data
-}
-
 package() {
-	cp -r "$srcdir/data/opt" "$pkgdir/opt"
-	cp -r "$srcdir/data/usr" "$pkgdir/usr"
+	cd "${srcdir}"
+	tar -xJf data.tar.xz -C "${pkgdir}"
+	ls "${pkgdir}"
+	install -Dm 644 "${pkgdir}"/opt/Synology/SynologyDrive/LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 {% endblock %}