diff --git a/.cirrus.yml b/.cirrus.yml
index ccca6bac..87809f6b 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -69,9 +69,17 @@ doccheck_task:
     only_if: $CIRRUS_PR != ''
     depends_on:
       - validate
-    container:  *build_container
+    container:
+        image: "${FEDORA_CONTAINER_FQIN}"
+        cpu: 4
+        memory: 8
+    env:
+        BUILDTAGS: &withopengpg 'btrfs_noversion libdm_no_deferred_remove containers_image_openpgp'
     script: |
-      "${GOSRC}/${SCRIPT_BASE}/runner.sh" setup
+      # TODO: Can't use 'runner.sh setup' inside container.  However,
+      # removing the pre-installed package is the only necessary step
+      # at the time of this comment.
+      dnf erase -y skopeo  # Guarantee non-interference
       "${SKOPEO_PATH}/${SCRIPT_BASE}/runner.sh" build
       "${SKOPEO_PATH}/${SCRIPT_BASE}/runner.sh" doccheck
 
@@ -110,7 +118,7 @@ cross_task:
         disk: 200
         image_name: ${FEDORA_CACHE_IMAGE_NAME}
     env:
-        BUILDTAGS: 'btrfs_noversion libdm_no_deferred_remove containers_image_openpgp'
+        BUILDTAGS: *withopengpg
     setup_script: >-
         "${GOSRC}/${SCRIPT_BASE}/runner.sh" setup
     cross_script: >-
@@ -142,15 +150,13 @@ test_skopeo_task:
               BUILDTAGS: 'btrfs_noversion libdm_no_deferred_remove'
         - name: "Skopeo Test w/ opengpg"
           env:
-              BUILDTAGS: 'btrfs_noversion libdm_no_deferred_remove containers_image_openpgp'
+              BUILDTAGS: *withopengpg
     setup_script: >-
         "${GOSRC}/${SCRIPT_BASE}/runner.sh" setup
     vendor_script: >-
         "${SKOPEO_PATH}/${SCRIPT_BASE}/runner.sh" vendor
     build_script: >-
         "${SKOPEO_PATH}/${SCRIPT_BASE}/runner.sh" build
-    validate_script: >-
-        "${SKOPEO_PATH}/${SCRIPT_BASE}/runner.sh" validate
     unit_script: >-
         "${SKOPEO_PATH}/${SCRIPT_BASE}/runner.sh" unit
     integration_script: >-
diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh
index 24e6d72e..0cba9197 100755
--- a/contrib/cirrus/runner.sh
+++ b/contrib/cirrus/runner.sh
@@ -54,19 +54,15 @@ _run_vendor() {
 }
 
 _run_build() {
-    podmanmake bin/skopeo BUILDTAGS="$BUILDTAGS"
+    make bin/skopeo BUILDTAGS="$BUILDTAGS"
 }
 
 _run_cross() {
     podmanmake local-cross BUILDTAGS="$BUILDTAGS"
 }
 
-_run_validate() {
-    podmanmake validate-local BUILDTAGS="$BUILDTAGS"
-}
-
 _run_doccheck() {
-    podmanmake validate-docs BUILDTAGS="$BUILDTAGS"
+    make validate-docs BUILDTAGS="$BUILDTAGS"
 }
 
 _run_unit() {