diff --git a/.travis.yml b/.travis.yml
index c129235..b436cdd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,6 +23,8 @@ jobs:
   include:
     - stage: deploy
       name: "Create Manifest"
-      install: go get github.com/estesp/manifest-tool
+      install:
+        - 'echo ''{ "experimental": true }'' | sudo tee /etc/docker/daemon.json'
+        - sudo systemctl restart docker
       before_script: docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
       script: ./create-manifest
diff --git a/create-manifest b/create-manifest
index 63e51f9..e6e743f 100755
--- a/create-manifest
+++ b/create-manifest
@@ -1,3 +1,23 @@
 #!/bin/bash -ex
 
-"${GOPATH}/bin/manifest-tool" push from-spec manifests/manifest.yml
+DOCKER_ORG=agners
+DOCKER_IMAGE=archlinuxarm
+
+TAGS="latest $(date +'%Y%m%d')"
+
+for TAG in $TAGS
+do
+	docker manifest create --amend $DOCKER_ORG/$DOCKER_IMAGE:$TAG \
+				$DOCKER_ORG/$DOCKER_IMAGE-arm32v7:$TAG \
+				$DOCKER_ORG/$DOCKER_IMAGE-arm64v8:$TAG
+
+	docker manifest annotate $DOCKER_ORG/$DOCKER_IMAGE:$TAG \
+			$DOCKER_ORG/$DOCKER_IMAGE-arm32v7:$TAG \
+			--os linux --arch arm --variant v7
+
+	docker manifest annotate $DOCKER_ORG/$DOCKER_IMAGE:$TAG \
+			$DOCKER_ORG/$DOCKER_IMAGE-arm64v8:$TAG \
+			--os linux --arch arm64 --variant v8
+
+	docker manifest push $DOCKER_ORG/$DOCKER_IMAGE:$TAG
+done
diff --git a/manifests/manifest.yml b/manifests/manifest.yml
deleted file mode 100644
index f563e14..0000000
--- a/manifests/manifest.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-image: agners/archlinuxarm:latest
-manifests:
-  - image: agners/archlinuxarm-arm32v7:latest
-    platform:
-      architecture: arm
-      variant: arm32v7
-      os: linux
-  - image: agners/archlinuxarm-arm64v8:latest
-    platform:
-      architecture: arm
-      variant: arm64v8
-      os: linux