diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f45d09f..0c6212e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,7 @@
 stages:
   - build
   - build-docker
+  - manifest
 
 build-windows-amd64:
   image: golang:alpine
@@ -76,3 +77,10 @@ build-docker-arm64:
     - chmod +x tmp/qemu-aarch64-static
     - docker image build -t $CI_REGISTRY_IMAGE:arm64-latest -f docker/Dockerfile.arm64 .
     - docker push $CI_REGISTRY_IMAGE:arm64-latest
+
+manifest:
+  image: registry.git.meow.tf/docker/tools/manifest-tool
+  stage: manifest
+  script:
+    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+    - manifest-tool push from-spec manifest.yml
diff --git a/manifest.yml b/manifest.yml
new file mode 100644
index 0000000..a20577f
--- /dev/null
+++ b/manifest.yml
@@ -0,0 +1,14 @@
+image: registry.git.meow.tf/tyler/godns:latest
+manifests:
+- image: registry.git.meow.tf/tyler/godns:amd64-latest
+  platform:
+    architecture: amd64
+    os: linux
+- image: registry.git.meow.tf/tyler/godns:arm-latest
+  platform:
+    architecture: arm
+    os: linux
+- image: registry.git.meow.tf/tyler/godns:arm64-latest
+  platform:
+    architecture: arm64
+    os: linux
\ No newline at end of file