diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 772ca21..db162f9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,11 +10,6 @@ stages:
   - build
   - package
 
-cache:
-  key: "PIPELINE-$CI_PIPELINE_ID"
-  paths:
-  - src/meow.tf/deb-simple/vendor
-
 glide-install:
   stage: init
   script:
@@ -22,27 +17,38 @@ glide-install:
   - glide install
   - cd $CI_PROJECT_DIR
   - mkdir -p build/i386 build/amd64 build/armv7
+  cache:
+    key: "pipeline-$CI_PIPELINE_ID"
+    paths:
+    - src/meow.tf/deb-simple/vendor
 
 build-i386:
   stage: build
   script:
   - mkdir -p build/i386
-  - go build -o build/amd64/deb-simple
   - GOOS=linux GOARCH=386 go build -o build/i386/deb-simple
   artifacts:
     paths:
     - build
+  cache:
+    key: "pipeline-$CI_PIPELINE_ID"
+    policy: pull
+    paths:
+    - src/meow.tf/deb-simple/vendor
 
 build-amd64:
   stage: build
   script:
   - mkdir -p build/amd64
   - go build -o build/amd64/deb-simple
-  - GOOS=linux GOARCH=386 go build -o build/i386/deb-simple
-  - GOOS=linux GOARCH=arm GOARM=7 go build -o build/armv7/deb-simple
   artifacts:
     paths:
     - build
+  cache:
+    key: "pipeline-$CI_PIPELINE_ID"
+    policy: pull
+    paths:
+    - src/meow.tf/deb-simple/vendor
 
 build-armv7:
   stage: build
@@ -52,6 +58,11 @@ build-armv7:
   artifacts:
     paths:
     - build
+  cache:
+    key: "pipeline-$CI_PIPELINE_ID"
+    policy: pull
+    paths:
+    - src/meow.tf/deb-simple/vendor
 
 package-i386:
   stage: package