diff --git a/.cirrus.yml b/.cirrus.yml
index 7cff6ceaa5e..5123994ddd0 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -19,8 +19,6 @@ env:
     CIRRUS_CLONE_DEPTH: 50
     # Unless set by in_podman.sh, default to operating outside of a podman container
     IN_PODMAN: 'false'
-    # Not cross-compiling by default
-    CROSS_TARGET: ""
 
     ####
     #### Cache-image names to test with
@@ -176,12 +174,14 @@ cross_build_task:
     depends_on:
       - unit
 
-    env:
-        matrix:
-            CROSS_TARGET: cross
+    osx_instance:
+        image: 'catalina-base'
 
-    setup_script: '${SCRIPT_BASE}/setup.sh |& ${_TIMESTAMP}'
-    build_script: '${SCRIPT_BASE}/build.sh |& ${_TIMESTAMP}'
+    script:
+        - brew install go
+        - brew install go-md2man
+        - brew install gpgme
+        - make cross CGO_ENABLED=0
 
     binary_artifacts:
         path: ./bin/*
diff --git a/contrib/cirrus/build.sh b/contrib/cirrus/build.sh
index b73e73c68cd..b478a13034c 100755
--- a/contrib/cirrus/build.sh
+++ b/contrib/cirrus/build.sh
@@ -16,13 +16,10 @@ then
     in_podman --rm $IN_PODMAN_NAME $0
 else
     echo "Compiling buildah (\$GOSRC=$GOSRC)"
-    showrun make clean ${CROSS_TARGET:-all} ${CROSS_TARGET:+CGO_ENABLED=0 cross}
+    showrun make clean all
 
     echo "Installing buildah"
     mkdir -p bin
-    if [[ -z "$CROSS_TARGET" ]]
-    then
-        showrun make install PREFIX=/usr
-        showrun ./bin/buildah info
-    fi
+    showrun make install PREFIX=/usr
+    showrun ./bin/buildah info
 fi
diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh
index 7acae89d662..262a365d8e2 100755
--- a/contrib/cirrus/lib.sh
+++ b/contrib/cirrus/lib.sh
@@ -39,9 +39,6 @@ else
     ) > /dev/stderr
 fi
 
-# Not cross-compiling by default
-CROSS_TARGET="${CROSS_TARGET:-}"
-
 # Essential default paths, many are overridden when executing under Cirrus-CI
 # others are duplicated here, to assist in debugging.
 GOPATH="${GOPATH:-/var/tmp/go}"
diff --git a/contrib/cirrus/setup.sh b/contrib/cirrus/setup.sh
index e8a0e64f0fd..d31cd1187a7 100755
--- a/contrib/cirrus/setup.sh
+++ b/contrib/cirrus/setup.sh
@@ -62,17 +62,14 @@ if [[ -z "$CONTAINER" ]]; then
     warn "I/O scheduler: $(cat /sys/block/sda/queue/scheduler)"
 fi
 
-if [[ -z "$CROSS_TARGET" ]]
-then
-    execute_local_registry  # checks for existing port 5000 listener
+execute_local_registry  # checks for existing port 5000 listener
 
-    if [[ "$IN_PODMAN" == "true" ]]
-    then
-        req_env_vars IN_PODMAN_IMAGE IN_PODMAN_NAME
-        echo "Setting up image to use for \$IN_PODMAN=true testing"
-        cd $GOSRC
-        in_podman $IN_PODMAN_IMAGE $0
-        showrun podman commit $IN_PODMAN_NAME $IN_PODMAN_NAME
-        showrun podman rm -f $IN_PODMAN_NAME
-    fi
+if [[ "$IN_PODMAN" == "true" ]]
+then
+    req_env_vars IN_PODMAN_IMAGE IN_PODMAN_NAME
+    echo "Setting up image to use for \$IN_PODMAN=true testing"
+    cd $GOSRC
+    in_podman $IN_PODMAN_IMAGE $0
+    showrun podman commit $IN_PODMAN_NAME $IN_PODMAN_NAME
+    showrun podman rm -f $IN_PODMAN_NAME
 fi
diff --git a/contrib/cirrus/test.sh b/contrib/cirrus/test.sh
index 515f57318e0..f24dbfa15c6 100755
--- a/contrib/cirrus/test.sh
+++ b/contrib/cirrus/test.sh
@@ -12,8 +12,7 @@ then
     # Host build environment != container environment
     showrun make clean
     in_podman --rm $IN_PODMAN_NAME:latest $0 $1
-elif [[ -z "$CROSS_TARGET" ]]
-then
+else
     cd $GOSRC
 
     showrun make
@@ -79,6 +78,4 @@ then
             die "First parameter to $(basename $0) not supported: '$1'"
             ;;
     esac
-else
-    echo "Testing a cross-compiled $CROSS_TARGET target not possible on this platform"
 fi