diff --git a/gnu/ci.scm b/gnu/ci.scm
index 279dd4d910..6ee8499728 100644
--- a/gnu/ci.scm
+++ b/gnu/ci.scm
@@ -190,15 +190,16 @@ SYSTEM."
 
   (define (pointless? target)
     ;; Return #t if it makes no sense to cross-build to TARGET from SYSTEM.
-    (match system
-      ((or "x86_64-linux" "i686-linux")
-       (if (string-contains target "mingw")
-           (not (string=? "x86_64-linux" system))
-           #f))
-      (_
-       ;; Don't try to cross-compile from non-Intel platforms: this isn't
-       ;; very useful and these are often brittle configurations.
-       #t)))
+    (or (string=? target "avr") ; Nothing for AVR at this time.
+        (match system
+          ((or "x86_64-linux" "i686-linux")
+           (if (string-contains target "mingw")
+               (not (string=? "x86_64-linux" system))
+               #f))
+          (_
+           ;; Don't try to cross-compile from non-Intel platforms: this isn't
+           ;; very useful and these are often brittle configurations.
+           #t))))
 
   (define (either proc1 proc2 proc3)
     (lambda (x)
@@ -372,7 +373,7 @@ valid.  Append SUFFIX to the job name."
 
 (define %x86-64-micro-architectures
   ;; Micro-architectures for which we build tuned variants.
-  '("westmere" "ivybridge" "haswell" "skylake" "skylake-avx512"))
+  '("haswell" "skylake" "x86-64-v2" "x86-64-v3" "x86-64-v4"))
 
 (define (tuned-package-jobs store package system)
   "Return a list of jobs for PACKAGE tuned for SYSTEM's micro-architectures."