diff --git a/.drone.jsonnet b/.drone.jsonnet
index dec90b2bc..a23bd10cb 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -169,7 +169,7 @@ local deb_builder(image, distro, distro_branch, arch='amd64', loki_repo=true) =
         |||
           # Look for the debian branch in this repo first, try upstream if that fails.
           if ! git checkout $${distro_branch}; then
-              git remote add --fetch upstream https://github.com/oxen-io/loki-network.git &&
+              git remote add --fetch upstream https://github.com/oxen-io/lokinet.git &&
               git checkout $${distro_branch}
           fi
         |||,
@@ -323,11 +323,11 @@ local mac_builder(name,
                   cmake_extra='-DWITH_HIVE=ON'),
 
   // Deb builds:
-  deb_builder(docker_base + 'debian-sid', 'sid', 'debian/sid'),
-  deb_builder(docker_base + 'debian-bullseye', 'bullseye', 'debian/bullseye'),
-  deb_builder(docker_base + 'ubuntu-impish', 'impish', 'ubuntu/impish'),
-  deb_builder(docker_base + 'ubuntu-focal', 'focal', 'ubuntu/focal'),
-  deb_builder(docker_base + 'debian-sid', 'sid', 'debian/sid', arch='arm64'),
+  deb_builder(docker_base + 'debian-sid-debhelper', 'sid', 'debian/sid'),
+  deb_builder(docker_base + 'debian-bullseye-debhelper', 'bullseye', 'debian/bullseye'),
+  deb_builder(docker_base + 'ubuntu-impish-debhelper', 'impish', 'ubuntu/impish'),
+  deb_builder(docker_base + 'ubuntu-focal-debhelper', 'focal', 'ubuntu/focal'),
+  deb_builder(docker_base + 'debian-sid-debhelper', 'sid', 'debian/sid', arch='arm64'),
 
   // Macos builds:
   mac_builder('macOS (Release)'),
diff --git a/contrib/ci/docker/40-debian-bullseye-debhelper.dockerfile b/contrib/ci/docker/40-debian-bullseye-debhelper.dockerfile
new file mode 100644
index 000000000..05236d48c
--- /dev/null
+++ b/contrib/ci/docker/40-debian-bullseye-debhelper.dockerfile
@@ -0,0 +1,10 @@
+ARG ARCH=amd64
+FROM registry.oxen.rocks/lokinet-ci-debian-bullseye/${ARCH}
+RUN apt-get -o=Dpkg::Use-Pty=0 --no-install-recommends -q install -y \
+        ccache \
+        debhelper \
+        devscripts \
+        equivs \
+        git \
+        git-buildpackage \
+        python3-dev
diff --git a/contrib/ci/docker/40-debian-sid-debhelper.dockerfile b/contrib/ci/docker/40-debian-sid-debhelper.dockerfile
new file mode 100644
index 000000000..e05764508
--- /dev/null
+++ b/contrib/ci/docker/40-debian-sid-debhelper.dockerfile
@@ -0,0 +1,10 @@
+ARG ARCH=amd64
+FROM registry.oxen.rocks/lokinet-ci-debian-sid/${ARCH}
+RUN apt-get -o=Dpkg::Use-Pty=0 --no-install-recommends -q install -y \
+        ccache \
+        debhelper \
+        devscripts \
+        equivs \
+        git \
+        git-buildpackage \
+        python3-dev
diff --git a/contrib/ci/docker/40-ubuntu-focal-debhelper.dockerfile b/contrib/ci/docker/40-ubuntu-focal-debhelper.dockerfile
new file mode 100644
index 000000000..288179538
--- /dev/null
+++ b/contrib/ci/docker/40-ubuntu-focal-debhelper.dockerfile
@@ -0,0 +1,10 @@
+ARG ARCH=amd64
+FROM registry.oxen.rocks/lokinet-ci-ubuntu-focal/${ARCH}
+RUN apt-get -o=Dpkg::Use-Pty=0 --no-install-recommends -q install -y \
+        ccache \
+        debhelper \
+        devscripts \
+        equivs \
+        git \
+        git-buildpackage \
+        python3-dev
diff --git a/contrib/ci/docker/40-ubuntu-impish-debhelper.dockerfile b/contrib/ci/docker/40-ubuntu-impish-debhelper.dockerfile
new file mode 100644
index 000000000..e73bb07ec
--- /dev/null
+++ b/contrib/ci/docker/40-ubuntu-impish-debhelper.dockerfile
@@ -0,0 +1,10 @@
+ARG ARCH=amd64
+FROM registry.oxen.rocks/lokinet-ci-ubuntu-impish/${ARCH}
+RUN apt-get -o=Dpkg::Use-Pty=0 --no-install-recommends -q install -y \
+        ccache \
+        debhelper \
+        devscripts \
+        equivs \
+        git \
+        git-buildpackage \
+        python3-dev
diff --git a/contrib/ci/docker/arm64v8/40-debian-sid-debhelper.dockerfile b/contrib/ci/docker/arm64v8/40-debian-sid-debhelper.dockerfile
new file mode 120000
index 000000000..e7f04dc7a
--- /dev/null
+++ b/contrib/ci/docker/arm64v8/40-debian-sid-debhelper.dockerfile
@@ -0,0 +1 @@
+../40-debian-sid-debhelper.dockerfile
\ No newline at end of file
diff --git a/contrib/ci/docker/rebuild-docker-images.sh b/contrib/ci/docker/rebuild-docker-images.sh
index 6a3b97684..a0773a0b1 100755
--- a/contrib/ci/docker/rebuild-docker-images.sh
+++ b/contrib/ci/docker/rebuild-docker-images.sh
@@ -40,3 +40,5 @@ for latest in "${!manifests[@]}"; do
     docker manifest create $latest ${manifests[$latest]}
     docker manifest push $latest
 done
+
+echo -e "\n\n\n\e[32;1mAll done!\e[1m\n\n"