diff --git a/.ci/build_deb.sh b/.ci/build_deb.sh
index 2a970f83e..f72689d19 100755
--- a/.ci/build_deb.sh
+++ b/.ci/build_deb.sh
@@ -2,8 +2,10 @@
 set -xe
 
 od=$(pwd)
-mkdir -p pkg/${MATRIX_OS}/opt/bin
-mv cloudfire-${MATRIX_ARCH} pkg/${MATRIX_OS}/opt/bin/cloudfire
+mkdir -p pkg/${MATRIX_OS}/opt/cloudfire/bin
+mv cloudfire-${MATRIX_ARCH} pkg/${MATRIX_OS}/opt/cloudfire/bin/cloudfire
 cd pkg
-dpkg-deb --build ${MATRIX_OS}
-mv -f ${MATRIX_OS}.deb ../cloudfire_${MATRIX_OS}_${MATRIX_ARCH}.deb
+dpkg-deb --build ${MATRIX_OS}_${MATRIX_ARCH}
+mv -f *.deb ../
+
+ls -lR ../
diff --git a/pkg/ubuntu-18.04/DEBIAN/control b/pkg/ubuntu-18.04_amd64/DEBIAN/control
similarity index 100%
rename from pkg/ubuntu-18.04/DEBIAN/control
rename to pkg/ubuntu-18.04_amd64/DEBIAN/control
diff --git a/pkg/ubuntu-18.04/DEBIAN/postinst b/pkg/ubuntu-18.04_amd64/DEBIAN/postinst
similarity index 100%
rename from pkg/ubuntu-18.04/DEBIAN/postinst
rename to pkg/ubuntu-18.04_amd64/DEBIAN/postinst
diff --git a/pkg/ubuntu-18.04/DEBIAN/templates b/pkg/ubuntu-18.04_amd64/DEBIAN/templates
similarity index 100%
rename from pkg/ubuntu-18.04/DEBIAN/templates
rename to pkg/ubuntu-18.04_amd64/DEBIAN/templates
diff --git a/pkg/ubuntu-18.04/lib/systemd/system/cloudfire.service b/pkg/ubuntu-18.04_amd64/lib/systemd/system/cloudfire.service
similarity index 100%
rename from pkg/ubuntu-18.04/lib/systemd/system/cloudfire.service
rename to pkg/ubuntu-18.04_amd64/lib/systemd/system/cloudfire.service
diff --git a/pkg/ubuntu-20.04/DEBIAN/control b/pkg/ubuntu-20.04_amd64/DEBIAN/control
similarity index 100%
rename from pkg/ubuntu-20.04/DEBIAN/control
rename to pkg/ubuntu-20.04_amd64/DEBIAN/control
diff --git a/pkg/ubuntu-20.04/DEBIAN/postinst b/pkg/ubuntu-20.04_amd64/DEBIAN/postinst
similarity index 100%
rename from pkg/ubuntu-20.04/DEBIAN/postinst
rename to pkg/ubuntu-20.04_amd64/DEBIAN/postinst
diff --git a/pkg/ubuntu-20.04/DEBIAN/templates b/pkg/ubuntu-20.04_amd64/DEBIAN/templates
similarity index 100%
rename from pkg/ubuntu-20.04/DEBIAN/templates
rename to pkg/ubuntu-20.04_amd64/DEBIAN/templates
diff --git a/pkg/ubuntu-20.04/lib/systemd/system/cloudfire.service b/pkg/ubuntu-20.04_amd64/lib/systemd/system/cloudfire.service
similarity index 100%
rename from pkg/ubuntu-20.04/lib/systemd/system/cloudfire.service
rename to pkg/ubuntu-20.04_amd64/lib/systemd/system/cloudfire.service