diff --git a/twackup-cli/Makefile.toml b/twackup-cli/Makefile.toml
index 230c2c5..9eed367 100644
--- a/twackup-cli/Makefile.toml
+++ b/twackup-cli/Makefile.toml
@@ -44,7 +44,7 @@ command = "ldid"
 args = ["-S", "${TWACKUP_FAT_BINARY}"]
 
 [tasks.create-deb]
-cwd = "${ARTIFACTS_OUTPUT_DIR}"
+cwd = "${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}"
 command = "bundle"
 args = [
     "exec", "fpm",
@@ -52,6 +52,7 @@ args = [
     "--output-type", "deb",
     "--force",
     "--prefix", "${DEB_PREFIX}",
+    "--package", "${ARTIFACTS_OUTPUT_DIR}/${DEB_IDENTIFIER}_${CARGO_MAKE_CRATE_VERSION}_${DEB_ARCHITECTURE}.deb",
     "--deb-no-changelog",
     "--log", "warn",
     "--name", "${DEB_IDENTIFIER}",
diff --git a/twackup-gui/Makefile.toml b/twackup-gui/Makefile.toml
index 590bdaa..713175e 100644
--- a/twackup-gui/Makefile.toml
+++ b/twackup-gui/Makefile.toml
@@ -57,7 +57,7 @@ mv -v Twackup.app.dSYM "${DEST_DIR}"
 
 [tasks.create-deb]
 private = true
-cwd = "${ARTIFACTS_OUTPUT_DIR}"
+cwd = "${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}"
 command = "bundle"
 args = [
     "exec", "fpm",
@@ -65,6 +65,7 @@ args = [
     "--output-type", "deb",
     "--force",
     "--prefix", "${DEB_PREFIX}",
+    "--package", "${ARTIFACTS_OUTPUT_DIR}/${DEB_IDENTIFIER}_${CARGO_MAKE_CRATE_VERSION}_${DEB_ARCHITECTURE}.deb",
     "--deb-no-changelog",
     "--log", "warn",
     "--name", "${DEB_IDENTIFIER}",
diff --git a/twackup/Makefile.toml b/twackup/Makefile.toml
index dfe8667..b3f9069 100644
--- a/twackup/Makefile.toml
+++ b/twackup/Makefile.toml
@@ -70,7 +70,7 @@ command = "ldid"
 args = ["-S", "${TWACKUP_FAT_DYLIB}"]
 
 [tasks.create-deb]
-cwd = "${ARTIFACTS_OUTPUT_DIR}"
+cwd = "${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}"
 command = "bundle"
 args = [
     "exec", "fpm",
@@ -78,6 +78,7 @@ args = [
     "--output-type", "deb",
     "--force",
     "--prefix", "${DEB_PREFIX}",
+    "--package", "${ARTIFACTS_OUTPUT_DIR}/${DEB_IDENTIFIER}_${CARGO_MAKE_CRATE_VERSION}_${DEB_ARCHITECTURE}.deb",
     "--deb-no-changelog",
     "--log", "warn",
     "--name", "${DEB_IDENTIFIER}",