diff --git a/.circleci/config.yml b/.circleci/config.yml
index 98228df4b9..bf6764d5b2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -26,7 +26,7 @@ jobs:
           cd ../
           git clone --depth=1 --no-single-branch https://github.com/mattermost/mattermost-webapp.git
           cd mattermost-webapp
-          git checkout $CIRCLE_BRANCH || git checkout release-6.0
+          git checkout $CIRCLE_BRANCH || git checkout master
           export WEBAPP_GIT_COMMIT=$(git rev-parse HEAD)
           echo "$WEBAPP_GIT_COMMIT"
 
@@ -537,18 +537,18 @@ workflows:
             - check-mattermost-vet
             - check-golangci-lint
             - build-api-spec
-#      - upload-s3-sha:
-#          context: mattermost-ci-pr-builds-s3
-#          requires:
-#            - build
-#      - upload-s3:
-#          context: mattermost-ci-pr-builds-s3
-#          requires:
-#            - build
-#      - build-docker:
-#          context: matterbuild-docker
-#          requires:
-#            - upload-s3-sha
+      - upload-s3-sha:
+          context: mattermost-ci-pr-builds-s3
+          requires:
+            - build
+      - upload-s3:
+          context: mattermost-ci-pr-builds-s3
+          requires:
+            - build
+      - build-docker:
+          context: matterbuild-docker
+          requires:
+            - upload-s3-sha
       - test:
           name: test-mysql
           dbdriver: mysql
diff --git a/i18n/en.json b/i18n/en.json
index ad92c44e30..79d1b3599f 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -8211,10 +8211,6 @@
     "id": "model.config.is_valid.read_timeout.app_error",
     "translation": "Invalid value for read timeout."
   },
-  {
-    "id": "model.config.is_valid.replica_mismatch.app_error",
-    "translation": "Number of replica lag queries is more than the number of replicas configured. Must be less than or equal to the number of replicas."
-  },
   {
     "id": "model.config.is_valid.restrict_direct_message.app_error",
     "translation": "Invalid direct message restriction. Must be 'any', or 'team'."
diff --git a/model/config.go b/model/config.go
index 1ac1ab8d27..7701ff038c 100644
--- a/model/config.go
+++ b/model/config.go
@@ -3296,10 +3296,6 @@ func (s *SqlSettings) isValid() *AppError {
 		return NewAppError("Config.IsValid", "model.config.is_valid.sql_migrations_statement_timout.app_error", nil, "", http.StatusBadRequest)
 	}
 
-	if len(s.ReplicaLagSettings) > len(s.DataSourceReplicas) {
-		return NewAppError("Config.IsValid", "model.config.is_valid.replica_mismatch.app_error", nil, "", http.StatusBadRequest)
-	}
-
 	return nil
 }