diff --git a/contrib/build-dokku.Dockerfile b/contrib/build-dokku.Dockerfile
index 83973b119..afadbb4bc 100644
--- a/contrib/build-dokku.Dockerfile
+++ b/contrib/build-dokku.Dockerfile
@@ -44,6 +44,8 @@ FROM builder as armhf
 COPY --from=amd64 /tmp /tmp
 COPY --from=amd64 /usr/local/share/man/man1/dokku.1 /usr/local/share/man/man1/dokku.1-generated
 
+RUN rm -rf /tmp/build-dokku
+
 ARG PLUGIN_MAKE_TARGET
 ARG DOKKU_VERSION=master
 ARG DOKKU_GIT_REV
diff --git a/deb.mk b/deb.mk
index 249221cb8..049df7f73 100644
--- a/deb.mk
+++ b/deb.mk
@@ -49,3 +49,4 @@ endif
 	cp debian/lintian-overrides /tmp/build-dokku/usr/share/lintian/overrides/dokku
 	sed -i.bak "s/^Version: .*/Version: `cat /tmp/build-dokku/var/lib/dokku/STABLE_VERSION`/g" /tmp/build-dokku/DEBIAN/control && rm /tmp/build-dokku/DEBIAN/control.bak
 	dpkg-deb --build /tmp/build-dokku "$(BUILD_DIRECTORY)/dokku_`cat /tmp/build-dokku/var/lib/dokku/VERSION`_$(DOKKU_ARCHITECTURE).deb"
+	lintian "$(BUILD_DIRECTORY)/dokku_`cat /tmp/build-dokku/var/lib/dokku/VERSION`_$(DOKKU_ARCHITECTURE).deb"