diff --git a/.gitlab/ci/.code-quality-ci.yml b/.gitlab/ci/.code-quality-ci.yml
index 8db3b339e0cd6384eb298798f99b56fc928006d7..8bc8c35f0a8f3f091e16bf144db79d2896de2745 100644
--- a/.gitlab/ci/.code-quality-ci.yml
+++ b/.gitlab/ci/.code-quality-ci.yml
@@ -7,9 +7,9 @@ code-quality:
         - make ci-lint
     artifacts:
         reports:
-            codequality: gl-code-quality-report.json
+            codequality: gl-codeclimate.json
         paths:
-            - gl-code-quality-report.json
+            - gl-codeclimate.json
     needs: []
 
 code-vulnerability:
diff --git a/.golangci.yml b/.golangci.yml
index 981b9610312adf52842ccc4e1c8263a0f5d3aa8b..30f446c5c6bb7faa65696b12964edc27ebfa6160 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -24,7 +24,10 @@ run:
 
 # output settings -> code-climate for GitLab
 output:
-    format: code-climate
+    formats:
+      - format: code-climate
+        path: gl-codeclimate.json
+      - format: colored-line-number
     print-issued-lines: true
     print-linter-name: true
     uniq-by-line: true
diff --git a/Makefile b/Makefile
index fa33811628f77fee9267b753f471768c49e22793..99ac40d1efea4e08bfb5980593d67c77cabd6dfa 100644
--- a/Makefile
+++ b/Makefile
@@ -53,10 +53,10 @@ install-tools:
 	@echo Finished installing development tooling
 
 lint: install-tools
-	./$(TOOLS_DIR)/golangci-lint run --config .golangci.yml | jq
+	./$(TOOLS_DIR)/golangci-lint run --config .golangci.yml
 
 lint-fix: install-tools
-	./$(TOOLS_DIR)/golangci-lint run --config .golangci.yml --fix | jq
+	./$(TOOLS_DIR)/golangci-lint run --config .golangci.yml --fix
 
 build: pre build-gosdn build-gosdnc build-plugin-registry build-venv-manager build-arista-routing-engine-app build-hostname-checker-app build-basic-interface-monitoring-app
 
diff --git a/makefiles/ci/Makefile b/makefiles/ci/Makefile
index dae623fa2b7335b74dad2dcffea60e964411a883..4593b4877b882f04973d01a56e103d7e9929a963 100644
--- a/makefiles/ci/Makefile
+++ b/makefiles/ci/Makefile
@@ -2,4 +2,4 @@ ci-install-tools:
 	go install gotest.tools/gotestsum@$(GOTESTSUM_VERSION)
 
 ci-lint: ci-install-tools
-	golangci-lint run --config .golangci.yml --out-format code-climate
+	golangci-lint run --config .golangci.yml