diff --git a/.ci/build_deb.sh b/.ci/build_deb.sh
index 92ac6012a..64c1db637 100755
--- a/.ci/build_deb.sh
+++ b/.ci/build_deb.sh
@@ -1,9 +1,9 @@
 #!/usr/bin/env bash
 set -xe
 
-od=$(pwd)
-mkdir -p pkg/${MATRIX_OS}/opt/cloudfire/bin
+prefix=$MATRIX_OS_$MATRIX_ARCH
+
+mkdir -p pkg/$prefix/opt/cloudfire/bin
 mv cloudfire-${MATRIX_ARCH} pkg/${MATRIX_OS}/opt/cloudfire/bin/cloudfire
-cd pkg
-dpkg-deb --build ${MATRIX_OS}_${MATRIX_ARCH}
-mv -f *.deb ../cloudfire_${MATRIX_OS}_${MATRIX_ARCH}.deb
+dpkg-deb --build pkg/$prefix
+mv -f $prefix.deb ../cloudfire_$prefix.deb
diff --git a/.ci/functional_test.sh b/.ci/functional_test.sh
index 992c5872f..64f32a72e 100755
--- a/.ci/functional_test.sh
+++ b/.ci/functional_test.sh
@@ -5,7 +5,10 @@ sudo apt-get update
 sudo apt-get install -y postgresql \
   wireguard iptables net-tools curl ca-certificates
 sudo systemctl start postgresql
-sudo dpkg -i cloudfire_${MATRIX_OS}_${MATRIX_ARCH}.deb
+
+file=cloudfire_${MATRIX_OS}_${MATRIX_ARCH}.deb
+file $file
+sudo dpkg -i $file
 
 echo "Enabling service..."
 sudo systemctl start cloudfire