diff --git a/build/ci/.code-quality-ci.yml b/build/ci/.code-quality-ci.yml
index ab2aa8d7b3f5a988e5827b08c82c5a32459bdd94..eacbfe4b6495fe32fc80002a5c53b432084b3893 100644
--- a/build/ci/.code-quality-ci.yml
+++ b/build/ci/.code-quality-ci.yml
@@ -1,25 +1,10 @@
-code-quality-master:
-  image: golangci/golangci-lint:latest-alpine
-  stage: test
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-  script:
-    # writes golangci-lint output to gl-code-quality-report.json
-    - golangci-lint run --config build/ci/.golangci-config/.golangci-master.yml --out-format code-climate | tee gl-code-quality-report.json
-  artifacts:
-    reports:
-      codequality: gl-code-quality-report.json
-    paths:
-      - gl-code-quality-report.json
-
-
 code-quality:
   image: golangci/golangci-lint:latest-alpine
   stage: test
-  allow_failure: true
   rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME != $CI_DEFAULT_BRANCH
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+    - if: $CI_COMMIT_BRANCH == "develop"
   script:
     # writes golangci-lint output to gl-code-quality-report.json
     - golangci-lint run --config build/ci/.golangci-config/.golangci.yml --out-format code-climate | tee gl-code-quality-report.json
@@ -27,4 +12,4 @@ code-quality:
     reports:
       codequality: gl-code-quality-report.json
     paths:
-      - gl-code-quality-report.json
+      - gl-code-quality-report.json
\ No newline at end of file
diff --git a/build/ci/.golangci-config/.golangci-master.yml b/build/ci/.golangci-config/.golangci-master.yml
deleted file mode 100644
index 1ca12a130fcef6a4ff882340c5c1f981c0804521..0000000000000000000000000000000000000000
--- a/build/ci/.golangci-config/.golangci-master.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-run:
-  timeout: 5m
-  issues-exit-code: 1
-  # directories to be ignored by linters
-  skip-dirs:
-    - forks
-    - test
-  skip-dirs-default: true
-  skip-files:
-      - nucleus/http.go
-# output settings -> code-climate for GitLab
-output:
-  format: code-climate
-  print-issued-lines: true
-  print-linter-name: true
-  uniq-by-line: true
-  path-prefix: ""
-# custom settings for linters
-linters-settings:
-  gocyclo:
-    min-complexity: 15
-  golint:
-    min-confidence: 0.8
-# enable the specific needed linters
-linters:
-  disable-all: true
-  enable:
-    - gofmt
-    - golint
-    - gocyclo
-    - govet
-issues:
-  exclude-use-default: false
diff --git a/build/ci/.golangci-config/.golangci.yml b/build/ci/.golangci-config/.golangci.yml
index 85a89bf0ecf6493e88b723971d9e043fe2d268ff..1ca12a130fcef6a4ff882340c5c1f981c0804521 100644
--- a/build/ci/.golangci-config/.golangci.yml
+++ b/build/ci/.golangci-config/.golangci.yml
@@ -29,3 +29,5 @@ linters:
     - golint
     - gocyclo
     - govet
+issues:
+  exclude-use-default: false
diff --git a/build/ci/.golangci-config/.runlint.sh b/build/ci/.golangci-config/.runlint.sh
index 7b0012a32e7d08ffa9de118104d51f8d129c6aee..774573b108c985a07f43d16ed44d0f63c1a7c8ca 100755
--- a/build/ci/.golangci-config/.runlint.sh
+++ b/build/ci/.golangci-config/.runlint.sh
@@ -1,4 +1,4 @@
 golangci-lint run\
-  --config .ci/.golangci-master.yml\
+  --config .ci/.golangci.yml\
   --out-format code-climate |\
   jq -r '.[] | "\(.location.path):\(.location.lines.begin) \(.description)"'