diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 95d3ed35..168468b2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,14 +4,14 @@ variables:
   PROJECTNAME: "watermarkpodautoscaler"
   TARGET_TAG: v$CI_PIPELINE_ID-$CI_COMMIT_SHORT_SHA
   BUILD_DOCKER_REGISTRY: "registry.ddbuild.io/ci"
-  JOB_DOCKER_IMAGE: "registry.ddbuild.io/ci-containers-project:v2.0.0"
+  JOB_DOCKER_IMAGE: "registry.ddbuild.io/ci-containers-project:v3.0.0"
   DOCKER_REGISTRY_LOGIN_SSM_KEY: docker_hub_login
   DOCKER_REGISTRY_PWD_SSM_KEY: docker_hub_pwd
   DOCKER_REGISTRY_URL: docker.io
-cache: &global_cache
-  key: ${CI_COMMIT_REF_SLUG}
-  paths:
-    - /go/pkg/mod
+# cache: &global_cache
+#   key: ${CI_COMMIT_REF_SLUG}
+#   paths:
+#     - /go/pkg/mod
 
 stages:
   - build
@@ -25,12 +25,26 @@ before_script:
 build:
   stage: build
   tags: ["arch:amd64"]
+  variables:
+    KUBERNETES_MEMORY_REQUEST: 16Gi
+    KUBERNETES_MEMORY_LIMIT: 16Gi
+    KUBERNETES_CPU_REQUEST: 4
+    KUBERNETES_CPU_LIMIT: 4
+    GOMEMLIMIT: 15GiB
+    GOMAXPROCS: 4
   script:
     - make build
 
 tests:
   stage: test
   tags: ["arch:amd64"]
+  variables:
+    KUBERNETES_MEMORY_REQUEST: 16Gi
+    KUBERNETES_MEMORY_LIMIT: 16Gi
+    KUBERNETES_CPU_REQUEST: 4
+    KUBERNETES_CPU_LIMIT: 4
+    GOMEMLIMIT: 15GiB
+    GOMAXPROCS: 4
   script:
     - make test
 
diff --git a/Makefile b/Makefile
index 21bb9824..b35c20b6 100644
--- a/Makefile
+++ b/Makefile
@@ -191,7 +191,7 @@ patch-crds: bin/$(PLATFORM)/yq
 
 .PHONY: lint
 lint: bin/$(PLATFORM)/golangci-lint fmt vet
-	bin/$(PLATFORM)/golangci-lint run ./...
+	bin/$(PLATFORM)/golangci-lint run -v ./...
 
 
 .PHONY: licenses
@@ -214,7 +214,9 @@ bin/$(PLATFORM)/jq: Makefile
 	hack/install-jq.sh "bin/$(PLATFORM)" 1.7.1
 
 bin/$(PLATFORM)/golangci-lint: Makefile
-	hack/install-golangci-lint.sh -b "bin/$(PLATFORM)" v1.61.0
+	mkdir -p bin/$(PLATFORM)
+	curl -L -o bin/$(PLATFORM)/golangci-lint https://storage.googleapis.com/lenaic/golangci-lint
+	chmod +x bin/$(PLATFORM)/golangci-lint
 
 bin/$(PLATFORM)/operator-sdk: Makefile
 	hack/install-operator-sdk.sh v1.23.0