diff --git a/pkg/config/loader.go b/pkg/config/loader.go
index efdbfce1f17d8..948139496473e 100644
--- a/pkg/config/loader.go
+++ b/pkg/config/loader.go
@@ -302,17 +302,6 @@ func (l *Loader) handleGoVersion() {
 
 	l.cfg.LintersSettings.Gocritic.Go = trimmedGoVersion
 
-	// staticcheck related linters.
-	if l.cfg.LintersSettings.Staticcheck.GoVersion == "" {
-		l.cfg.LintersSettings.Staticcheck.GoVersion = trimmedGoVersion
-	}
-	if l.cfg.LintersSettings.Gosimple.GoVersion == "" {
-		l.cfg.LintersSettings.Gosimple.GoVersion = trimmedGoVersion
-	}
-	if l.cfg.LintersSettings.Stylecheck.GoVersion == "" {
-		l.cfg.LintersSettings.Stylecheck.GoVersion = trimmedGoVersion
-	}
-
 	os.Setenv("GOSECGOVERSION", l.cfg.Run.Go)
 }
 
diff --git a/pkg/goanalysis/runner_loadingpackage.go b/pkg/goanalysis/runner_loadingpackage.go
index 614cc1c006c07..44d6769586e95 100644
--- a/pkg/goanalysis/runner_loadingpackage.go
+++ b/pkg/goanalysis/runner_loadingpackage.go
@@ -10,6 +10,7 @@ import (
 	"go/types"
 	"os"
 	"reflect"
+	"strings"
 	"sync"
 	"sync/atomic"
 
@@ -153,10 +154,15 @@ func (lp *loadingPackage) loadFromSource(loadMode LoadMode) error {
 		return imp.Types, nil
 	}
 
-	// TODO(ldez) temporary workaround
-	rv, err := goutil.CleanRuntimeVersion()
-	if err != nil {
-		return err
+	var goVersion string
+	if pkg.Module != nil && pkg.Module.GoVersion != "" {
+		goVersion = "go" + strings.TrimPrefix(pkg.Module.GoVersion, "go")
+	} else {
+		var err error
+		goVersion, err = goutil.CleanRuntimeVersion()
+		if err != nil {
+			return err
+		}
 	}
 
 	tc := &types.Config{
@@ -164,7 +170,7 @@ func (lp *loadingPackage) loadFromSource(loadMode LoadMode) error {
 		Error: func(err error) {
 			pkg.Errors = append(pkg.Errors, lp.convertError(err)...)
 		},
-		GoVersion: rv, // TODO(ldez) temporary workaround
+		GoVersion: goVersion,
 		Sizes:     types.SizesFor(build.Default.Compiler, build.Default.GOARCH),
 	}
 
diff --git a/pkg/lint/linter/config.go b/pkg/lint/linter/config.go
index 57c51fa75e4cb..6d6d4b17e7d4f 100644
--- a/pkg/lint/linter/config.go
+++ b/pkg/lint/linter/config.go
@@ -81,7 +81,7 @@ func (lc *Config) IsSlowLinter() bool {
 }
 
 func (lc *Config) WithLoadFiles() *Config {
-	lc.LoadMode |= packages.NeedName | packages.NeedFiles | packages.NeedCompiledGoFiles
+	lc.LoadMode |= packages.NeedName | packages.NeedFiles | packages.NeedCompiledGoFiles | packages.NeedModule
 	return lc
 }