diff --git a/.golangci.yml b/.golangci.yml
index 1267dab95..7685e8c6c 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -11,7 +11,7 @@ linters:
     - gocyclo
     - gofmt
     - goimports
-    - golint
+    - revive
     - gosimple
     - govet
     - ineffassign
diff --git a/Dockerfile b/Dockerfile
index a77882d8c..67f4b698e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,7 +16,7 @@
 #   limitations under the License.
 
 ARG GO_VERSION=1.16-alpine
-ARG GOLANGCI_LINT_VERSION=v1.39.0-alpine
+ARG GOLANGCI_LINT_VERSION=v1.40.1-alpine
 ARG PROTOC_GEN_GO_VERSION=v1.4.3
 
 FROM --platform=${BUILDPLATFORM} golang:${GO_VERSION} AS base
diff --git a/aci/convert/convert.go b/aci/convert/convert.go
index 0032a4b95..3cb7211b5 100644
--- a/aci/convert/convert.go
+++ b/aci/convert/convert.go
@@ -347,7 +347,7 @@ func ContainerGroupToContainer(containerID string, cg containerinstance.Containe
 	status := GetStatus(cc, cg)
 	platform := string(cg.OsType)
 
-	var envVars map[string]string = nil
+	var envVars map[string]string
 	if cc.EnvironmentVariables != nil && len(*cc.EnvironmentVariables) != 0 {
 		envVars = map[string]string{}
 		for _, envVar := range *cc.EnvironmentVariables {
diff --git a/aci/convert/convert_test.go b/aci/convert/convert_test.go
index ee3bcc2c5..7cef8300a 100644
--- a/aci/convert/convert_test.go
+++ b/aci/convert/convert_test.go
@@ -570,7 +570,7 @@ func TestConvertContainerGroupStatus(t *testing.T) {
 }
 
 func container(status *string) containerinstance.Container {
-	var state *containerinstance.ContainerState = nil
+	var state *containerinstance.ContainerState
 	if status != nil {
 		state = &containerinstance.ContainerState{
 			State: status,
@@ -586,7 +586,7 @@ func container(status *string) containerinstance.Container {
 }
 
 func group(status *string) containerinstance.ContainerGroup {
-	var view *containerinstance.ContainerGroupPropertiesInstanceView = nil
+	var view *containerinstance.ContainerGroupPropertiesInstanceView
 	if status != nil {
 		view = &containerinstance.ContainerGroupPropertiesInstanceView{
 			State: status,
diff --git a/aci/convert/ports.go b/aci/convert/ports.go
index df55b5466..12e6ea049 100644
--- a/aci/convert/ports.go
+++ b/aci/convert/ports.go
@@ -58,7 +58,7 @@ func convertPortsToAci(service serviceConfigAciHelper) ([]containerinstance.Cont
 			Protocol: groupProtocol,
 		})
 	}
-	var dnsLabelName *string = nil
+	var dnsLabelName *string
 	if service.DomainName != "" {
 		dnsLabelName = &service.DomainName
 	}
diff --git a/aci/convert/registry_credentials.go b/aci/convert/registry_credentials.go
index 321c27b5b..2ffbfe61d 100644
--- a/aci/convert/registry_credentials.go
+++ b/aci/convert/registry_credentials.go
@@ -70,7 +70,7 @@ func getRegistryCredentials(project compose.Project, helper registryHelper) ([]c
 		return nil, err
 	}
 
-	var cloudEnvironment *login.CloudEnvironment = nil
+	var cloudEnvironment *login.CloudEnvironment
 	if ce, err := loginService.GetCloudEnvironment(); err != nil {
 		cloudEnvironment = &ce
 	}
diff --git a/aci/e2e/aci_secrets_resources/web/main.go b/aci/e2e/aci_secrets_resources/web/main.go
index 4224b9c27..2dc9fe85b 100644
--- a/aci/e2e/aci_secrets_resources/web/main.go
+++ b/aci/e2e/aci_secrets_resources/web/main.go
@@ -42,7 +42,7 @@ func main() {
 	}
 }
 
-var healthy bool = true
+var healthy = true
 
 func fail(w http.ResponseWriter, req *http.Request) {
 	healthy = false
diff --git a/aci/e2e/e2e-aci_test.go b/aci/e2e/e2e-aci_test.go
index 71ac5548c..e2a46900d 100644
--- a/aci/e2e/e2e-aci_test.go
+++ b/aci/e2e/e2e-aci_test.go
@@ -385,7 +385,7 @@ func TestContainerRunAttached(t *testing.T) {
 
 	// Used in subtests
 	var (
-		container         string = "test-container"
+		container         = "test-container"
 		endpoint          string
 		followLogsProcess *icmd.Result
 	)
diff --git a/aci/login/login_test.go b/aci/login/login_test.go
index c1d7a3441..3388945a1 100644
--- a/aci/login/login_test.go
+++ b/aci/login/login_test.go
@@ -459,7 +459,7 @@ func TestNonstandardCloudEnvironment(t *testing.T) {
 		},
 		"resourceManager": "https://management.docker.com/"
 	}]`)
-	var metadataReqCount int32 = 0
+	var metadataReqCount int32
 	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		_, err := w.Write(dockerCloudMetadata)
 		assert.NilError(t, err)
diff --git a/cli/cmd/compose/run.go b/cli/cmd/compose/run.go
index ca2582cc3..fec435346 100644
--- a/cli/cmd/compose/run.go
+++ b/cli/cmd/compose/run.go
@@ -220,8 +220,5 @@ func startDependencies(ctx context.Context, backend compose.Service, project typ
 	if err := backend.Create(ctx, &project, compose.CreateOptions{}); err != nil {
 		return err
 	}
-	if err := backend.Start(ctx, &project, compose.StartOptions{}); err != nil {
-		return err
-	}
-	return nil
+	return backend.Start(ctx, &project, compose.StartOptions{})
 }
diff --git a/cli/formatter/colors.go b/cli/formatter/colors.go
index d5b2e816a..8c2480882 100644
--- a/cli/formatter/colors.go
+++ b/cli/formatter/colors.go
@@ -86,7 +86,7 @@ func makeColorFunc(code string) colorFunc {
 	}
 }
 
-var nextColor func() colorFunc = rainbowColor
+var nextColor = rainbowColor
 
 func rainbowColor() colorFunc {
 	return <-loop
diff --git a/kube/client/client.go b/kube/client/client.go
index fdffc3474..6c4d6eb01 100644
--- a/kube/client/client.go
+++ b/kube/client/client.go
@@ -116,7 +116,7 @@ func (kc *KubeClient) GetLogs(ctx context.Context, projectName string, consumer
 
 // WaitForPodState blocks until pods reach desired state
 func (kc KubeClient) WaitForPodState(ctx context.Context, opts WaitForStatusOptions) error {
-	var timeout time.Duration = time.Minute
+	var timeout = time.Minute
 	if opts.Timeout != nil {
 		timeout = *opts.Timeout
 	}
diff --git a/local/volumes.go b/local/volumes.go
index 9b49aaf42..6b268e013 100644
--- a/local/volumes.go
+++ b/local/volumes.go
@@ -63,10 +63,7 @@ func (vs *volumeService) Create(ctx context.Context, name string, options interf
 }
 
 func (vs *volumeService) Delete(ctx context.Context, volumeID string, options interface{}) error {
-	if err := vs.apiClient.VolumeRemove(ctx, volumeID, false); err != nil {
-		return err
-	}
-	return nil
+	return vs.apiClient.VolumeRemove(ctx, volumeID, false)
 }
 
 func (vs *volumeService) Inspect(ctx context.Context, volumeID string) (volumes.Volume, error) {