diff --git a/.circleci/config.yml b/.circleci/config.yml
index a16e0c4d67..a073ec9175 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -80,7 +80,7 @@ jobs:
       - run:
           command: |
             echo "Installing golangci-lint"
-            curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b /usr/local/bin v1.23.3 # Keep this in sync with .golangci.yml and Jenkinsfile.pr
+            curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b /usr/local/bin v1.23.6 # Keep this in sync with Jenkinsfile.pr
             echo "Installing mattermost-govet"
             export GOBIN=${PWD}/mattermost-server/bin
             GO111MODULE=off go get -u github.com/mattermost/mattermost-govet
diff --git a/.golangci.yml b/.golangci.yml
index 9497854664..3310ed41cc 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,6 +1,3 @@
-service:
-  golangci-lint-version: 1.23.3 # Keep this in sync with .circleci/config.yml and Jenkinsfile.pr
-
 run:
   timeout: 5m
   modules-download-mode: vendor
diff --git a/build/Jenkinsfile.pr b/build/Jenkinsfile.pr
index 7915a95527..ce62bc7f73 100644
--- a/build/Jenkinsfile.pr
+++ b/build/Jenkinsfile.pr
@@ -103,7 +103,7 @@ pipeline {
 						sh """
 							cd /go/src/github.com/mattermost/mattermost-server
 							echo "Installing golangci-lint"
-							curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b /usr/local/bin v1.23.3 # Keep this in sync with .golangci.yml and .circleci/config.yml
+							curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b /usr/local/bin v1.23.6 # Keep this in sync with .circleci/config.yml
 							echo "Installing mattermost-govet"
 							GO111MODULE=off go get -u github.com/mattermost/mattermost-govet
 							export PATH=$PATH:$GOBIN