diff --git a/d42-agent-remote/Dockerfile b/d42-agent-remote/Dockerfile
new file mode 100644
index 0000000..50e9aac
--- /dev/null
+++ b/d42-agent-remote/Dockerfile
@@ -0,0 +1,12 @@
+FROM debian:buster AS builder
+RUN apt-get update && \
+    apt-get -y install curl unzip
+RUN curl -o d42-agent-remote.zip \
+         $(curl -s https://www.device42.com/autodiscovery/ | grep d42-agent-remote | cut -d'"' -f4)
+RUN unzip d42-agent-remote.zip
+RUN chmod +x d42-agent-remote/d42_autodisc_linux_x64
+
+FROM debian:buster
+COPY --from=builder d42-agent-remote/d42_autodisc_linux_x64 /usr/local/bin/d42_autodisc_linux_x64
+
+ENTRYPOINT ["/usr/local/bin/d42_autodisc_linux_x64", "-config", "/etc/device42/inventory.cfg"]
diff --git a/zuul.d/d42-agent-remote.yaml b/zuul.d/d42-agent-remote.yaml
new file mode 100644
index 0000000..69755fc
--- /dev/null
+++ b/zuul.d/d42-agent-remote.yaml
@@ -0,0 +1,31 @@
+- job:
+    name: docker-images:build:d42-agent-remote
+    parent: vexxhost-build-docker-image
+    provides: docker-images:image:d42-agent-remote
+    vars: &id001
+      docker_images:
+      - context: d42-agent-remote/
+        repository: vexxhost/d42-agent-remote
+    files: &id002
+    - ^d42-agent-remote/.*
+- job:
+    name: docker-images:upload:d42-agent-remote
+    parent: vexxhost-upload-docker-image
+    provides: docker-images:image:d42-agent-remote
+    vars: *id001
+    files: *id002
+- job:
+    name: docker-images:promote:d42-agent-remote
+    parent: vexxhost-promote-docker-image
+    vars: *id001
+    files: *id002
+- project:
+    check:
+      jobs:
+      - docker-images:build:d42-agent-remote
+    gate:
+      jobs:
+      - docker-images:upload:d42-agent-remote
+    promote:
+      jobs:
+      - docker-images:promote:d42-agent-remote