diff --git a/.cirrus.yml b/.cirrus.yml
index 4536c70359..d09baa5faa 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -30,7 +30,7 @@ env:
     SKOPEO_PR:
 
     # Google-cloud VM Images
-    IMAGE_SUFFIX: "c20240125t184057z-f39f38d13"
+    IMAGE_SUFFIX: "c20240320t153921z-f39f38d13"
     FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}"
     DEBIAN_CACHE_IMAGE_NAME: "debian-${IMAGE_SUFFIX}"
 
diff --git a/Makefile b/Makefile
index 2f25abe32a..9bdf578f65 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ BUILD_TAGS_DARWIN_CROSS = containers_image_openpgp
 BUILDTAGS = btrfs_noversion libdm_no_deferred_remove
 BUILDFLAGS := -tags "$(BUILDTAGS)"
 
-PACKAGES := $(shell GO111MODULE=on go list $(BUILDFLAGS) ./...)
+PACKAGES := $(shell go list $(BUILDFLAGS) ./...)
 SOURCE_DIRS = $(shell echo $(PACKAGES) | awk 'BEGIN{FS="/"; RS=" "}{print $$4}' | uniq)
 
 PREFIX ?= ${DESTDIR}/usr
@@ -41,7 +41,7 @@ export PATH := $(PATH):${GOBIN}
 all: tools test validate .gitvalidation
 
 build:
-	GO111MODULE="on" go build $(BUILDFLAGS) ./...
+	go build $(BUILDFLAGS) ./...
 
 $(MANPAGES): %: %.md
 	$(GOMD2MAN) -in $< -out $@
@@ -66,7 +66,7 @@ tools: .install.gitvalidation .install.golangci-lint
 
 .install.gitvalidation:
 	if [ ! -x "$(GOBIN)/git-validation" ]; then \
-		GO111MODULE="off" go get $(BUILDFLAGS) github.com/vbatts/git-validation; \
+		go install github.com/vbatts/git-validation@latest; \
 	fi
 
 .install.golangci-lint:
@@ -78,7 +78,7 @@ clean:
 	rm -rf $(MANPAGES)
 
 test:
-	@GO111MODULE="on" go test $(BUILDFLAGS) -cover ./...
+	@go test $(BUILDFLAGS) -cover ./...
 
 fmt:
 	@gofmt -l -s -w $(SOURCE_DIRS)
diff --git a/hack/validate.sh b/hack/validate.sh
index 078d34fff2..b8dafb5e4e 100755
--- a/hack/validate.sh
+++ b/hack/validate.sh
@@ -15,7 +15,7 @@ if [[ -z $(type -P gofmt) ]]; then
 fi
 
 echo "Executing go vet"
-GO111MODULE="on" go vet -tags="$BUILDTAGS" ./...
+go vet -tags="$BUILDTAGS" ./...
 
 echo "Executing gofmt"
 OUTPUT=$(gofmt -s -l . | sed -e '/^vendor/d')