diff --git a/debian/.gitlab-ci.yml b/debian/.gitlab-ci.yml
new file mode 100644
index 00000000..845003ca
--- /dev/null
+++ b/debian/.gitlab-ci.yml
@@ -0,0 +1,9 @@
+image: registry.gitlab.com/eighthave/ci-image-git-buildpackage:latest
+
+build:
+  artifacts:
+    paths:
+    - "*.deb"
+    expire_in: 1 day
+  script:
+    - gitlab-ci-git-buildpackage-all
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 00000000..ff417aa8
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,2 @@
+
+Test-Command: aptly repo create autopkgtest && aptly repo add autopkgtest /var/cache/apt/archives/*.deb
diff --git a/debian/watch b/debian/watch
index a3212f8a..f5688309 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-https://github.com/smira/aptly-dev/tags .*/v(\d[\d\.]*)\.tar\.gz debian uupdate
+https://github.com/aptly-dev/aptly/tags .*/v(\d[\d\.]*)\.tar\.gz debian uupdate