diff --git a/nightly.sh b/nightly.sh
index b4f5a35..2252405 100755
--- a/nightly.sh
+++ b/nightly.sh
@@ -123,6 +123,15 @@ $RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch src \
     "$DESTDIR" "$RSYNCTARGET/" \
     --variant Everything --variant Atomic --variant CloudImages --variant Docker --variant Server --variant Spins --variant Workstation \
     --link-dest="$RSYNCTARGET/Everything" --delete-after
+# aarch64 for Server and Everything is primary
+$RSYNCPREFIX compose-partial-copy --arch=aarch64 \
+    "$DESTDIR" "$RSYNCTARGET/" \
+    --variant Everything --variant Server \
+    --link-dest="$RSYNCTARGET/Everything" --exclude=repodata
+$RSYNCPREFIX compose-partial-copy --arch=aarch64 \
+    "$DESTDIR" "$RSYNCTARGET/" \
+    --variant Everything --variant Server --variant \
+    --link-dest="$RSYNCTARGET/Everything" --delete-after
 $RSYNCPREFIX rm "$RSYNCTARGET/.composeinfo"
 $RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCTARGET/" --name "$NEWCOMPOSE_ID"
 
@@ -145,12 +154,21 @@ $RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCALTTARGET/" --name "$NEWC
 if [ ! -d "$RSYNCSECTARGET" ]; then
   mkdir "$RSYNCSECTARGET"
 fi
-$RSYNCPREFIX compose-partial-copy --arch=aarch64 --arch=i386 --arch=ppc64 --arch=ppc64le --arch=s390x \
+$RSYNCPREFIX compose-partial-copy --arch=i386 --arch=ppc64 --arch=ppc64le --arch=s390x \
     "$DESTDIR" "$RSYNCSECTARGET/" \
     --link-dest="$RSYNCTARGET/Everything/" --exclude=repodata
-$RSYNCPREFIX compose-partial-copy --arch=aarch64 --arch=i386 --arch=ppc64 --arch=ppc64le --arch=s390x \
+$RSYNCPREFIX compose-partial-copy --arch=i386 --arch=ppc64 --arch=ppc64le --arch=s390x \
     "$DESTDIR" "$RSYNCSECTARGET/" \
     --link-dest="$RSYNCTARGET/Everything/" --delete-after
+# aarch64 is alternative for Atomic Cloud CloudImages Container Labs Spins Workstation
+$RSYNCPREFIX compose-partial-copy --arch=i386 --arch=ppc64 --arch=ppc64le --arch=s390x \
+    "$DESTDIR" "$RSYNCSECTARGET/" \
+    --variant Atomic --variant Cloud --variant CloudImages --variant Docker --variant Labs --variant Spins --variant Workstation \
+    --link-dest="$RSYNCTARGET/Everything/" --exclude=repodata
+$RSYNCPREFIX compose-partial-copy --arch=i386 --arch=ppc64 --arch=ppc64le --arch=s390x \
+    "$DESTDIR" "$RSYNCSECTARGET/" \
+    --variant Atomic --variant Cloud --variant CloudImages --variant Docker --variant Labs --variant Spins --variant Workstation \
+    --link-dest="$RSYNCTARGET/Everything/" --delete-after
 $RSYNCPREFIX rm "$RSYNCSECTARGET/.composeinfo"
 $RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCSECTARGET/" --name "$NEWCOMPOSE_ID"