diff --git a/builder/build-deb-inside-docker b/builder/build-deb-inside-docker
index 4dd7095..aa0651b 100755
--- a/builder/build-deb-inside-docker
+++ b/builder/build-deb-inside-docker
@@ -4,6 +4,11 @@ set -e
 
 cd "$(dirname "$0")/.."
 
+os=$(lsb_release -is | tr '[:upper:]' '[:lower:]')
+os_ver=$(lsb_release -rs)
+os_dir="builder/build/${os}_${os_ver}"
+
 dpkg-buildpackage -us -uc -b
-cp ../*.deb builder/build
+mkdir -p "$os_dir"
+cp ../*.deb "$os_dir"
 lintian ../*.deb