diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 02670c679a46d78fd2641b266a6da85eeed95cd9..89ef929c751ec321f855ebbb2754cd5f0945769d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: gcr.io/hedenstroem-docker/gitlab-builder-base
+image: gcr.io/hedenstroem-docker/gitlab-builder-tools
 
 before_script:
   - export GOPATH=${CI_PROJECT_DIR}/.cache
@@ -9,11 +9,11 @@ stages:
   - deps
 
 .build: &build
-  image: gcr.io/hedenstroem-docker/gitlab-builder-go:1.14
+  image: golang:1.14
   stage: build
-  only:
-    - master
-    - /^\d+[.]\d+[.]\d+$/
+#  only:
+#    - master
+#    - /^\d+[.]\d+[.]\d+$/
   cache:
     key: build
     paths:
@@ -27,6 +27,7 @@ stages:
       - $CI_PROJECT_NAME-$CI_JOB_NAME
 
 upload to s3:
+  image: amazon/aws-cli
   stage: upload
   only:
     - /^\d+[.]\d+[.]\d+$/
@@ -43,9 +44,9 @@ gitlab-builder-base:
     - /^\d+[.]\d+[.]\d+$/
   trigger: google-cloud/cloud-build/gitlab-builder-base
 
-"darwin-amd64": *build
-"linux-arm": *build
-"linux-386": *build
+#"darwin-amd64": *build
+#"linux-arm": *build
+#"linux-386": *build
 "linux-amd64": *build
-"windows-386": *build
-"windows-amd64": *build
+#"windows-386": *build
+#"windows-amd64": *build