diff --git a/.dockerignore b/.dockerignore
index 41db8dbc..9d68dd25 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,6 +1,10 @@
 .go/
 .git/
 obj-x86_64-linux-gnu/
+obj-aarch64-linux-gnu/
+obj-arm-linux-gnueabihf/
+obj-i686-linux-gnu/
 unit.out
 aptly.test
 build/
+dpkgs/
diff --git a/.gitignore b/.gitignore
index 6b1b2081..673918cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,21 +50,24 @@ system/files/aptly2_passphrase.gpg~
 
 .go/
 obj-x86_64-linux-gnu/
+obj-aarch64-linux-gnu/
+obj-arm-linux-gnueabihf/
+obj-i686-linux-gnu/
 
 # debian
 debian/.debhelper/
-debian/aptly.debhelper.log
-debian/aptly.postrm.debhelper
 debian/aptly.substvars
 debian/aptly/
 debian/debhelper-build-stamp
 debian/files
 debian/aptly-api/
-debian/aptly-api.debhelper.log
-debian/aptly-api.postrm.debhelper
+debian/*.debhelper
+debian/*.debhelper.log
 debian/aptly-api.substvars
-debian/aptly-dbg.debhelper.log
 debian/aptly-dbg.substvars
 debian/aptly-dbg/
+usr/bin/aptly
+dpkgs/
+debian/changelog.dpkg-bak
 
 docs/
diff --git a/Makefile b/Makefile
index 27ccdde1..5294db9a 100644
--- a/Makefile
+++ b/Makefile
@@ -107,18 +107,24 @@ dpkg: prepare swagger  ## Build debian packages
 	# set debian version
 	@if [ "`make -s releasetype`" = "ci" ]; then  \
 		echo CI Build, setting version... ; \
+		test ! -f debian/changelog.dpkg-bak || mv debian/changelog.dpkg-bak debian/changelog ; \
 		cp debian/changelog debian/changelog.dpkg-bak ; \
-		DEBEMAIL="CI <ci@aptly>" dch -v `make -s version` "CI build" ; \
+		DEBEMAIL="CI <ci@aptly.info>" dch -v `make -s version` "CI build" ; \
 	fi
+	# clean
+	rm -rf obj-i686-linux-gnu obj-arm-linux-gnueabihf obj-aarch64-linux-gnu obj-x86_64-linux-gnu
 	# Run dpkg-buildpackage
-	buildtype="any" ; \
+	@buildtype="any" ; \
 	if [ "$(DEBARCH)" = "amd64" ]; then  \
 	  buildtype="any,all" ; \
 	fi ; \
 	echo "\e[33m\e[1mBuilding: $$buildtype\e[0m" ; \
-	dpkg-buildpackage -us -uc --build=$$buildtype -d --host-arch=$(DEBARCH)
+	cmd="dpkg-buildpackage -us -uc --build=$$buildtype -d --host-arch=$(DEBARCH)" ; \
+	echo "$$cmd" ; \
+	$$cmd
+	lintian ../*_$(DEBARCH).changes || true
 	# cleanup
-	@test -f debian/changelog.dpkg-bak && mv debian/changelog.dpkg-bak debian/changelog || true ; \
+	@test ! -f debian/changelog.dpkg-bak || mv debian/changelog.dpkg-bak debian/changelog; \
 	mkdir -p build && mv ../*.deb build/ ; \
 	cd build && ls -l *.deb
 
@@ -148,7 +154,7 @@ docker-build:  ## Build aptly in docker container
 	@docker run -it --rm -v ${PWD}:/work/src aptly-dev /work/src/system/docker-wrapper build
 
 docker-shell:  ## Run aptly and other commands in docker container
-	@docker run -it --rm -v ${PWD}:/work/src aptly-dev /work/src/system/docker-wrapper || true
+	@docker run -it --rm -p 3142:3142 -v ${PWD}:/work/src aptly-dev /work/src/system/docker-wrapper || true
 
 docker-deb:  ## Build debian packages in docker container
 	@docker run -it --rm -v ${PWD}:/work/src aptly-dev /work/src/system/docker-wrapper dpkg DEBARCH=amd64
diff --git a/debian/aptly-api.preinst b/debian/aptly-api.preinst
deleted file mode 100755
index b7ec5041..00000000
--- a/debian/aptly-api.preinst
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#DEBHELPER#
-
-exit 0
diff --git a/system/Dockerfile b/system/Dockerfile
index c57f27df..b2da26e3 100644
--- a/system/Dockerfile
+++ b/system/Dockerfile
@@ -6,7 +6,9 @@ RUN apt-get update -y && apt-get install -y --no-install-recommends curl gnupg b
         golang/bookworm-backports golang-go/bookworm-backports golang-doc/bookworm-backports golang-src/bookworm-backports \
         make git python3 python3-requests-unixsocket python3-termcolor python3-swiftclient python3-boto python3-azure-storage \
         g++ python3-etcd3 python3-plyvel graphviz devscripts sudo dh-golang binutils-i686-linux-gnu binutils-aarch64-linux-gnu \
-        binutils-arm-linux-gnueabihf bash-completion zip ruby3.1-dev && \
+        binutils-arm-linux-gnueabihf bash-completion zip ruby3.1-dev lintian \
+        libc6-dev-i386-cross libc6-dev-armhf-cross libc6-dev-arm64-cross \
+        gcc-i686-linux-gnu gcc-arm-linux-gnueabihf gcc-aarch64-linux-gnu && \
     apt-get clean && rm -rf /var/lib/apt/lists/*
 
 RUN useradd -m --shell /bin/bash --home-dir /var/lib/aptly aptly