diff --git a/lib/autodiscover.sh b/lib/autodiscover.sh
index 81dd555..1c852a2 100644
--- a/lib/autodiscover.sh
+++ b/lib/autodiscover.sh
@@ -13,12 +13,20 @@ config_autodiscover() {
 
   TRAEFIK_HTTPAUTH_STRING_AUTODISCOVER=$(echo `htpasswd -nb admin@$DOMAIN $ADMINPASS` | sed -e s/\\$/\\$\\$/g)
 
-cat > /federated/apps/autodiscover/docker-compose.yml <<EOF
-version: '3.7'
+  if [ "$(uname -m)" = "aarch64" ]; then
+    # The federatedcomputer/autodiscover-email-settings container is built
+    # from the same sources as monogramm/autodiscover-email-settings
+    # without modifications.
+    # The only "change" is an aarch64 port.
+    CONTAINER=federatedcomputer/autodiscover-email-settings
+  else
+    CONTAINER=monogramm/autodiscover-email-settings
+  fi
 
+cat > /federated/apps/autodiscover/docker-compose.yml <<EOF
 services:
   autodiscover:
-    image: monogramm/autodiscover-email-settings:\${IMAGE_VERSION}
+    image: ${CONTAINER}:\${IMAGE_VERSION}
     container_name: autodiscover
     hostname: autodiscover.$DOMAIN
     restart: always