diff --git a/Makefile b/Makefile
index 5c813dac5c..2b699faa3c 100644
--- a/Makefile
+++ b/Makefile
@@ -629,7 +629,7 @@ endef
 .PHONY: .install.ginkgo
 .install.ginkgo: .gopathok
 	if [ ! -x "$(GOBIN)/ginkgo" ]; then \
-		$(GO_BUILD) -o ${GOPATH}/bin/ginkgo ./vendor/github.com/onsi/ginkgo/ginkgo ; \
+		$(call go-get,github.com/onsi/ginkgo); \
 	fi
 
 .PHONY: .install.gitvalidation
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh
index ea2c7d8e0a..f2bd1fd1ac 100755
--- a/contrib/cirrus/setup_environment.sh
+++ b/contrib/cirrus/setup_environment.sh
@@ -59,7 +59,7 @@ case "${OS_RELEASE_ID}" in
         workaround_bfq_bug
 
 	# HACK: Need Conmon 2.0.17, currently in updates-testing on F31.
-	dnf update -y --enablerepo=updates-testing conmon
+	$BIGTO dnf update -y --enablerepo=updates-testing conmon
 
         if [[ "$ADD_SECOND_PARTITION" == "true" ]]; then
             bash "$SCRIPT_BASE/add_second_partition.sh"