diff --git a/images/caddy/entrypoint.sh b/images/caddy/entrypoint.sh
index f218b52..779da78 100755
--- a/images/caddy/entrypoint.sh
+++ b/images/caddy/entrypoint.sh
@@ -3,10 +3,12 @@
 set -e
 
 CADDYFILE="${CADDYFILE:-/etc/caddy/Caddyfile}"
-/usr/bin/caddy validate --config "$CADDYFILE"
 
-if [ -n "$1" ]; then
+if [ "$1" = "validate" ] && [ -z "$2" ]; then
+    exec /usr/bin/caddy validate --config "$CADDYFILE"
+elif [ -n "$1" ]; then
     exec /usr/bin/caddy "$@"
 else
-    exec /usr/bin/caddy --config "$CADDYFILE"
+    /usr/bin/caddy validate --config "$CADDYFILE"
+    exec /usr/bin/caddy run --config "$CADDYFILE"
 fi
diff --git a/pipelines/build-and-push.json b/pipelines/build-and-push.json
index e14f8d6..bba713e 100644
--- a/pipelines/build-and-push.json
+++ b/pipelines/build-and-push.json
@@ -58,7 +58,8 @@
         },
         {
             "type": "simple",
-            "name": "caddy"
+            "name": "caddy",
+            "platform": "linux/amd64,linux/arm64/v8"
         }
     ]
 }
diff --git a/pipelines/jobs/simple-image.yml.j2 b/pipelines/jobs/simple-image.yml.j2
index 649f06f..eceaf79 100644
--- a/pipelines/jobs/simple-image.yml.j2
+++ b/pipelines/jobs/simple-image.yml.j2
@@ -37,6 +37,7 @@
           target: ''
           registry_url: "((registry_url))"
           buildkit_config: "((buildkit_config))"
+          image_platform: "{% if "platform" in job %}{{job.platform}}{% endif %}"
         {%- if "args" in job %}
         params:
         {%- for name, value in job.args.items() %}
@@ -45,7 +46,9 @@
         {%- endif %}
       - put: image-{{ job.name }}
         inputs: detect
-        params: { image: image/image.tar }
+        params: { image: image/image }
+        get_params:
+          format: oci
         no_get: true
 {%- endmacro -%}
 
diff --git a/tasks/build-image.yml b/tasks/build-image.yml
index b83c7d9..983bde4 100644
--- a/tasks/build-image.yml
+++ b/tasks/build-image.yml
@@ -23,7 +23,9 @@ params:
   CONTEXT: ((context))
   DOCKERFILE: ((dockerfile))
   TARGET: ((target))
+  OUTPUT_OCI: "true"
   BUILDKIT_EXTRA_CONFIG: ((buildkit_config))
+  IMAGE_PLATFORM: ((image_platform))
 
 run:
   path: build