diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 22df7c76986b74a20089f5550e334c4d888c90fa..39208396e7cbafcb034a1d4c2c884a5f916089de 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,7 +7,7 @@ before_script:
   - echo $NGINX_VERSION
   - echo $NGINX_BINARY
   # Relies on latest binary build artifact from https://git.ethitter.com/debian/nginx-build.
-  - curl -o nginx-build "${NGINX_BINARY}"
+  - curl -o sources/usr/sbin/nginx "${NGINX_BINARY}"
 
 after_script:
   - ls -la $CI_BUILDS_DIR
@@ -20,4 +20,4 @@ package:
     - debuild -us -uc
   artifacts:
     paths:
-      - nginx_${NGINX_VERSION}*.deb
+      - nginx*
diff --git a/source/debian/rules b/source/debian/rules
index 2719f46a87bd7099acd96b30a801ef5183df2c74..f2a3a80ebc8c774d1801b438feeafe922115bc4c 100755
--- a/source/debian/rules
+++ b/source/debian/rules
@@ -1,16 +1,19 @@
 #!/usr/bin/make -f
+
+export DESTROOT=$(CURDIR)/debian/nginx
+
 %:
 	dh $@
 
 override_dh_auto_install:
 	dh_auto_install
-	install etc/default/nginx /etc/default/nginx
-	install etc/init.d/nginx /etc/init.d/nginx
-	install etc/logrotate.d/nginx /etc/logrotate.d/nginx
-	install etc/nginx/ /etc/nginx/
-	install usr/lib/nginx/modules/ /usr/lib/nginx/modules/
-	install -m 0755 ../nginx-build /usr/sbin/nginx
-	install usr/share/doc/nginx/ /usr/share/doc/nginx/
-	install usr/share/nginx/ /usr/share/nginx/
-	install var/cache/nginx/ /var/cache/nginx/
-	install var/log/nginx/ /var/log/nginx/
+	install -D -p etc/default/nginx $(DESTROOT)/etc/default/nginx
+	install -D -p etc/init.d/nginx $(DESTROOT)/etc/init.d/nginx
+	install -D -p etc/logrotate.d/nginx $(DESTROOT)/etc/logrotate.d/nginx
+	install -d -p etc/nginx/ $(DESTROOT)/etc/nginx/
+	install -d -p usr/lib/nginx/modules/ $(DESTROOT)/usr/lib/nginx/modules/
+	install -D -p -m 0755 usr/sbin/nginx $(DESTROOT)/usr/sbin/nginx
+	install -d -p usr/share/doc/nginx/ $(DESTROOT)/usr/share/doc/nginx/
+	install -d -p usr/share/nginx/ $(DESTROOT)/usr/share/nginx/
+	install -d -p var/cache/nginx/ $(DESTROOT)/var/cache/nginx/
+	install -d -p var/log/nginx/ $(DESTROOT)/var/log/nginx/