diff --git a/Justfile b/Justfile
index 4d7588d..b513cd9 100644
--- a/Justfile
+++ b/Justfile
@@ -32,6 +32,7 @@ build context dockerfile='' image_target='' *args='':
         -v registry_url={{registry_url}} \
         -v 'buildkit_config={{buildkit_config}}' \
         {{args}}
+    @echo "$(tput bold)Image built and downloaded to /tmp/build-image/. You can import it with 'docker image import /tmp/build-image/image.tar <tag>'$(tput sgr0)"
 
 make-pipeline file:
     jinja2 --strict --outfile="{{file}}" pipelines/build-and-push.yml.j2 pipelines/build-and-push.json
diff --git a/images/caddy/Dockerfile b/images/caddy/Dockerfile
new file mode 100644
index 0000000..67ebb70
--- /dev/null
+++ b/images/caddy/Dockerfile
@@ -0,0 +1,10 @@
+FROM caddy:2.9.1-builder AS builder
+
+RUN xcaddy build --with github.com/WeidiDeng/caddy-cloudflare-ip
+
+FROM caddy:2.9.1
+
+COPY --from=builder /usr/bin/caddy /usr/bin/caddy
+
+VOLUME /etc/caddy
+CMD ["/usr/bin/caddy", "--config", "/etc/caddy/Caddyfile"]
diff --git a/pipelines/build-and-push.json b/pipelines/build-and-push.json
index f79b307..e14f8d6 100644
--- a/pipelines/build-and-push.json
+++ b/pipelines/build-and-push.json
@@ -55,6 +55,10 @@
         {
             "type": "simple",
             "name": "mx-puppet-steam"
+        },
+        {
+            "type": "simple",
+            "name": "caddy"
         }
     ]
 }