diff --git a/.travis/deploy_docker_rpi.sh b/.travis/deploy_docker_rpi.sh
index 0ab42a2..037a451 100755
--- a/.travis/deploy_docker_rpi.sh
+++ b/.travis/deploy_docker_rpi.sh
@@ -67,6 +67,14 @@ build_message Build V211 image started...
 deploy_v211
 build_message Build V211 image finished, check build result!
 
+build_message Build V171 arm64 image started...
+deploy_v171_arm64
+build_message Build V171 arm64 image finished, check build result!
+
+build_message Build V211 arm64 image started...
+deploy_v211_arm64
+build_message Build V211 arm64 image finished, check build result!
+
 build_message Preparing to Push multi-arch manifest to Docker Cloud ..
 deploy_multiarch
 
diff --git a/.travis/multiarch_manifests/multiarch_manifest_latest.yml b/.travis/multiarch_manifests/multiarch_manifest_latest.yml
index 9b1bd06..05b8a3d 100644
--- a/.travis/multiarch_manifests/multiarch_manifest_latest.yml
+++ b/.travis/multiarch_manifests/multiarch_manifest_latest.yml
@@ -5,9 +5,13 @@ manifests:
     platform:
       architecture: arm
       os: linux
+  -
+    image: treehouses/arm64-rpi-couchdb:2.1.1
+    platform:
+      architecture: arm64
+      os: linux
   -
     image: amd64/couchdb:2.1.1
     platform:
       architecture: amd64
       os: linux
-      
diff --git a/.travis/multiarch_manifests/multiarch_manifest_v1.7.1.yml b/.travis/multiarch_manifests/multiarch_manifest_v1.7.1.yml
index ee2cae2..9e0a361 100644
--- a/.travis/multiarch_manifests/multiarch_manifest_v1.7.1.yml
+++ b/.travis/multiarch_manifests/multiarch_manifest_v1.7.1.yml
@@ -5,6 +5,11 @@ manifests:
     platform:
       architecture: arm
       os: linux
+  -
+    image: treehouses/arm64-rpi-couchdb:1.7.1
+    platform:
+      architecture: arm64
+      os: linux
   -
     image: amd64/couchdb:1.7.1
     platform:
diff --git a/.travis/multiarch_manifests/multiarch_manifest_v2.1.1.yml b/.travis/multiarch_manifests/multiarch_manifest_v2.1.1.yml
index 7b044fc..6e5332d 100644
--- a/.travis/multiarch_manifests/multiarch_manifest_v2.1.1.yml
+++ b/.travis/multiarch_manifests/multiarch_manifest_v2.1.1.yml
@@ -5,6 +5,11 @@ manifests:
     platform:
       architecture: arm
       os: linux
+  -
+    image: treehouses/arm64-rpi-couchdb:2.1.1
+    platform:
+      architecture: arm64
+      os: linux
   -
     image: amd64/couchdb:2.1.1
     platform:
diff --git a/.travis/travis_utils.sh b/.travis/travis_utils.sh
index f649a39..de0c53d 100755
--- a/.travis/travis_utils.sh
+++ b/.travis/travis_utils.sh
@@ -153,6 +153,24 @@ deploy_v211(){
 	push_v211
 }
 
+deploy_v171_arm64(){
+	login_docker
+	sed -i -e "s/\(resin\/rpi-raspbian\)/resin\/aarch64-debian/" 1.7.1/Dockerfile
+	$V171_DOCKER_NAME_LATEST="arm64-$V171_DOCKER_NAME_LATEST"
+	$V171_DOCKER_NAME="arm64-$V171_DOCKER_NAME"
+	package_v171
+	push_v171
+}
+
+deploy_v211_arm64(){
+	login_docker
+	sed -i -e "s/\(resin\/rpi-raspbian\)/resin\/aarch64-debian/" 2.1.1/Dockerfile
+	$V211_DOCKER_NAME_LATEST="arm64-$V211_DOCKER_NAME_LATEST"
+	$V211_DOCKER_NAME="arm64-$V211_DOCKER_NAME"
+	package_v211
+	push_v211
+}
+
 deploy_multiarch(){
     if [ "$BRANCH" = "master" ]
 	then