diff --git a/.cirrus.yml b/.cirrus.yml
index c44277b05a..54e9106a7d 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -195,9 +195,9 @@ vendor_task:
         - "gating"
 
     env:
-        CIRRUS_WORKING_DIR: "/usr/src/libpod"
-        GOPATH: "/go"
-        GOSRC: "/go/src/github.com/containers/libpod"
+        CIRRUS_WORKING_DIR: "/var/tmp/go/src/github.com/containers/libpod"
+        GOPATH: "/var/tmp/go"
+        GOSRC: "$CIRRUS_WORKING_DIR"
 
     # Runs within Cirrus's "community cluster"
     container: