diff --git a/pkg/components/simplejson/simplejson_go11.go b/pkg/components/simplejson/simplejson_go11.go
index fad4cfc540f..9d6682a9883 100644
--- a/pkg/components/simplejson/simplejson_go11.go
+++ b/pkg/components/simplejson/simplejson_go11.go
@@ -1,3 +1,4 @@
+//go:build go1.1
 // +build go1.1
 
 package simplejson
diff --git a/pkg/infra/log/syslog.go b/pkg/infra/log/syslog.go
index d5394b4c0cf..41dc1ab816f 100644
--- a/pkg/infra/log/syslog.go
+++ b/pkg/infra/log/syslog.go
@@ -1,4 +1,5 @@
-//+build !windows,!nacl,!plan9
+//go:build !windows && !nacl && !plan9
+// +build !windows,!nacl,!plan9
 
 package log
 
diff --git a/pkg/infra/log/syslog_windows.go b/pkg/infra/log/syslog_windows.go
index e795c6b1447..a95377890a8 100644
--- a/pkg/infra/log/syslog_windows.go
+++ b/pkg/infra/log/syslog_windows.go
@@ -1,4 +1,5 @@
-//+build windows
+//go:build windows
+// +build windows
 
 package log
 
diff --git a/pkg/infra/remotecache/memcached_storage_integration_test.go b/pkg/infra/remotecache/memcached_storage_integration_test.go
index d1d82468644..a9f130593e5 100644
--- a/pkg/infra/remotecache/memcached_storage_integration_test.go
+++ b/pkg/infra/remotecache/memcached_storage_integration_test.go
@@ -1,3 +1,4 @@
+//go:build memcached
 // +build memcached
 
 package remotecache
diff --git a/pkg/infra/remotecache/redis_storage_integration_test.go b/pkg/infra/remotecache/redis_storage_integration_test.go
index 7efaca8298b..d393186f89e 100644
--- a/pkg/infra/remotecache/redis_storage_integration_test.go
+++ b/pkg/infra/remotecache/redis_storage_integration_test.go
@@ -1,3 +1,4 @@
+//go:build redis
 // +build redis
 
 package remotecache
diff --git a/pkg/infra/serverlock/serverlock_integration_test.go b/pkg/infra/serverlock/serverlock_integration_test.go
index 60c3cf17875..33d34308db7 100644
--- a/pkg/infra/serverlock/serverlock_integration_test.go
+++ b/pkg/infra/serverlock/serverlock_integration_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package serverlock
diff --git a/pkg/macaron/macaron.go b/pkg/macaron/macaron.go
index af0625a18a0..d6f0c4379fd 100644
--- a/pkg/macaron/macaron.go
+++ b/pkg/macaron/macaron.go
@@ -1,3 +1,4 @@
+//go:build go1.3
 // +build go1.3
 
 // Copyright 2014 The Macaron Authors
diff --git a/pkg/ruleguard.rules.go b/pkg/ruleguard.rules.go
index 8ae7dd40122..d182cebb3df 100644
--- a/pkg/ruleguard.rules.go
+++ b/pkg/ruleguard.rules.go
@@ -1,4 +1,6 @@
+//go:build ignore
 // +build ignore
+
 // The MIT License (MIT)
 //
 // Copyright (c) 2020 Grafana Labs <contact@grafana.com>, Damian Gryski <damian@gryski.com>
diff --git a/pkg/schema/load/constant.go b/pkg/schema/load/constant.go
index 0e4edadf366..4aee8c59a39 100644
--- a/pkg/schema/load/constant.go
+++ b/pkg/schema/load/constant.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package load
diff --git a/pkg/schema/load/constant_windows.go b/pkg/schema/load/constant_windows.go
index 7d4002b0f7f..db2089dc261 100644
--- a/pkg/schema/load/constant_windows.go
+++ b/pkg/schema/load/constant_windows.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package load
diff --git a/pkg/server/wire.go b/pkg/server/wire.go
index a430bb07f6d..7ec5adc8ea5 100644
--- a/pkg/server/wire.go
+++ b/pkg/server/wire.go
@@ -1,3 +1,4 @@
+//go:build wireinject
 // +build wireinject
 
 package server
diff --git a/pkg/server/wireexts_oss.go b/pkg/server/wireexts_oss.go
index e348b3a6faa..97b64317edd 100644
--- a/pkg/server/wireexts_oss.go
+++ b/pkg/server/wireexts_oss.go
@@ -1,3 +1,4 @@
+//go:build wireinject && oss
 // +build wireinject,oss
 
 package server
diff --git a/pkg/services/alerting/engine_integration_test.go b/pkg/services/alerting/engine_integration_test.go
index d623c631df2..4db265d548e 100644
--- a/pkg/services/alerting/engine_integration_test.go
+++ b/pkg/services/alerting/engine_integration_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package alerting
diff --git a/pkg/services/dashboards/dashboard_service_integration_test.go b/pkg/services/dashboards/dashboard_service_integration_test.go
index 355d6a5a4eb..1924986b639 100644
--- a/pkg/services/dashboards/dashboard_service_integration_test.go
+++ b/pkg/services/dashboards/dashboard_service_integration_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package dashboards
diff --git a/pkg/services/live/database/tests/storage_test.go b/pkg/services/live/database/tests/storage_test.go
index 559ecb10303..e0ea4aff811 100644
--- a/pkg/services/live/database/tests/storage_test.go
+++ b/pkg/services/live/database/tests/storage_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package tests
diff --git a/pkg/services/live/managedstream/cache_redis_test.go b/pkg/services/live/managedstream/cache_redis_test.go
index 05f029352e0..a9183e69936 100644
--- a/pkg/services/live/managedstream/cache_redis_test.go
+++ b/pkg/services/live/managedstream/cache_redis_test.go
@@ -1,3 +1,4 @@
+//go:build redis
 // +build redis
 
 package managedstream
diff --git a/pkg/services/login/authinfoservice/user_auth_test.go b/pkg/services/login/authinfoservice/user_auth_test.go
index cd93970a91d..3f4ae73be03 100644
--- a/pkg/services/login/authinfoservice/user_auth_test.go
+++ b/pkg/services/login/authinfoservice/user_auth_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package authinfoservice
diff --git a/pkg/services/ngalert/store/instance_database_test.go b/pkg/services/ngalert/store/instance_database_test.go
index 2b34ae23b75..fabc8ea750a 100644
--- a/pkg/services/ngalert/store/instance_database_test.go
+++ b/pkg/services/ngalert/store/instance_database_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package store_test
diff --git a/pkg/services/provisioning/dashboards/file_reader_linux_test.go b/pkg/services/provisioning/dashboards/file_reader_linux_test.go
index 5ccddddf810..c8f288d52f4 100644
--- a/pkg/services/provisioning/dashboards/file_reader_linux_test.go
+++ b/pkg/services/provisioning/dashboards/file_reader_linux_test.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package dashboards
diff --git a/pkg/services/sqlstore/alert_notification_test.go b/pkg/services/sqlstore/alert_notification_test.go
index bde1ad2c4cf..6042930ea27 100644
--- a/pkg/services/sqlstore/alert_notification_test.go
+++ b/pkg/services/sqlstore/alert_notification_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package sqlstore
diff --git a/pkg/services/sqlstore/alert_test.go b/pkg/services/sqlstore/alert_test.go
index b071c218120..d9e06d95479 100644
--- a/pkg/services/sqlstore/alert_test.go
+++ b/pkg/services/sqlstore/alert_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package sqlstore
diff --git a/pkg/services/sqlstore/annotation_test.go b/pkg/services/sqlstore/annotation_test.go
index d753f037fa2..d59a7e20a16 100644
--- a/pkg/services/sqlstore/annotation_test.go
+++ b/pkg/services/sqlstore/annotation_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package sqlstore
diff --git a/pkg/services/sqlstore/apikey_test.go b/pkg/services/sqlstore/apikey_test.go
index 9de983ed5ca..a482556acab 100644
--- a/pkg/services/sqlstore/apikey_test.go
+++ b/pkg/services/sqlstore/apikey_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package sqlstore
diff --git a/pkg/services/sqlstore/dashboard_acl_test.go b/pkg/services/sqlstore/dashboard_acl_test.go
index 9856e316bf6..13128fcb5af 100644
--- a/pkg/services/sqlstore/dashboard_acl_test.go
+++ b/pkg/services/sqlstore/dashboard_acl_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package sqlstore
diff --git a/pkg/services/sqlstore/dashboard_folder_test.go b/pkg/services/sqlstore/dashboard_folder_test.go
index b8dd72a9c9a..4825dd0924d 100644
--- a/pkg/services/sqlstore/dashboard_folder_test.go
+++ b/pkg/services/sqlstore/dashboard_folder_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package sqlstore
diff --git a/pkg/services/sqlstore/dashboard_provisioning_test.go b/pkg/services/sqlstore/dashboard_provisioning_test.go
index 192102c23a4..e564cc2228f 100644
--- a/pkg/services/sqlstore/dashboard_provisioning_test.go
+++ b/pkg/services/sqlstore/dashboard_provisioning_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package sqlstore
diff --git a/pkg/services/sqlstore/dashboard_snapshot_test.go b/pkg/services/sqlstore/dashboard_snapshot_test.go
index d677f461f86..0cc48773579 100644
--- a/pkg/services/sqlstore/dashboard_snapshot_test.go
+++ b/pkg/services/sqlstore/dashboard_snapshot_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package sqlstore
diff --git a/pkg/services/sqlstore/dashboard_test.go b/pkg/services/sqlstore/dashboard_test.go
index ea0e25ba6d3..bd46251c4ed 100644
--- a/pkg/services/sqlstore/dashboard_test.go
+++ b/pkg/services/sqlstore/dashboard_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package sqlstore
diff --git a/pkg/services/sqlstore/dashboard_version_test.go b/pkg/services/sqlstore/dashboard_version_test.go
index 20064d33929..233772581da 100644
--- a/pkg/services/sqlstore/dashboard_version_test.go
+++ b/pkg/services/sqlstore/dashboard_version_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package sqlstore
diff --git a/pkg/services/sqlstore/datasource_test.go b/pkg/services/sqlstore/datasource_test.go
index dbe184768d4..f1de7de2ccc 100644
--- a/pkg/services/sqlstore/datasource_test.go
+++ b/pkg/services/sqlstore/datasource_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package sqlstore
diff --git a/pkg/services/sqlstore/health_test.go b/pkg/services/sqlstore/health_test.go
index a3b6129edcb..5edf22c4b9a 100644
--- a/pkg/services/sqlstore/health_test.go
+++ b/pkg/services/sqlstore/health_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package sqlstore
diff --git a/pkg/services/sqlstore/login_attempt_test.go b/pkg/services/sqlstore/login_attempt_test.go
index b79b2bf0f81..90db30672ed 100644
--- a/pkg/services/sqlstore/login_attempt_test.go
+++ b/pkg/services/sqlstore/login_attempt_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package sqlstore
diff --git a/pkg/services/sqlstore/org_test.go b/pkg/services/sqlstore/org_test.go
index 5ea5c33f795..b94c3f6e35b 100644
--- a/pkg/services/sqlstore/org_test.go
+++ b/pkg/services/sqlstore/org_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package sqlstore
diff --git a/pkg/services/sqlstore/playlist_test.go b/pkg/services/sqlstore/playlist_test.go
index 4c7ca3ae4e0..9d387656454 100644
--- a/pkg/services/sqlstore/playlist_test.go
+++ b/pkg/services/sqlstore/playlist_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package sqlstore
diff --git a/pkg/services/sqlstore/preferences_test.go b/pkg/services/sqlstore/preferences_test.go
index dc97ff39bf2..aa4e0e1b26e 100644
--- a/pkg/services/sqlstore/preferences_test.go
+++ b/pkg/services/sqlstore/preferences_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package sqlstore
diff --git a/pkg/services/sqlstore/quota_test.go b/pkg/services/sqlstore/quota_test.go
index 6d35a6bdedc..e2751f81c98 100644
--- a/pkg/services/sqlstore/quota_test.go
+++ b/pkg/services/sqlstore/quota_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package sqlstore
diff --git a/pkg/services/sqlstore/searchstore/search_test.go b/pkg/services/sqlstore/searchstore/search_test.go
index 8cc58fc21fa..f66cc1d373f 100644
--- a/pkg/services/sqlstore/searchstore/search_test.go
+++ b/pkg/services/sqlstore/searchstore/search_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 // package search_test contains integration tests for search
diff --git a/pkg/services/sqlstore/sqlbuilder_test.go b/pkg/services/sqlstore/sqlbuilder_test.go
index 46ca2d277c5..972aa8e29e7 100644
--- a/pkg/services/sqlstore/sqlbuilder_test.go
+++ b/pkg/services/sqlstore/sqlbuilder_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package sqlstore
diff --git a/pkg/services/sqlstore/sqlstore_test.go b/pkg/services/sqlstore/sqlstore_test.go
index 5579d7aba7e..afa090070fb 100644
--- a/pkg/services/sqlstore/sqlstore_test.go
+++ b/pkg/services/sqlstore/sqlstore_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package sqlstore
diff --git a/pkg/services/sqlstore/stars_test.go b/pkg/services/sqlstore/stars_test.go
index d4bbd3aeb0c..116f9f804a1 100644
--- a/pkg/services/sqlstore/stars_test.go
+++ b/pkg/services/sqlstore/stars_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package sqlstore
diff --git a/pkg/services/sqlstore/stats_integration_test.go b/pkg/services/sqlstore/stats_integration_test.go
index eba45a787f0..af70c238d71 100644
--- a/pkg/services/sqlstore/stats_integration_test.go
+++ b/pkg/services/sqlstore/stats_integration_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package sqlstore
diff --git a/pkg/services/sqlstore/stats_test.go b/pkg/services/sqlstore/stats_test.go
index 4faee99cbdd..93ca1d1581b 100644
--- a/pkg/services/sqlstore/stats_test.go
+++ b/pkg/services/sqlstore/stats_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package sqlstore
diff --git a/pkg/services/sqlstore/tags_test.go b/pkg/services/sqlstore/tags_test.go
index 99d562809ca..aa11b9c8d4d 100644
--- a/pkg/services/sqlstore/tags_test.go
+++ b/pkg/services/sqlstore/tags_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package sqlstore
diff --git a/pkg/services/sqlstore/team_test.go b/pkg/services/sqlstore/team_test.go
index e4e52aabc21..981285442f7 100644
--- a/pkg/services/sqlstore/team_test.go
+++ b/pkg/services/sqlstore/team_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package sqlstore
diff --git a/pkg/services/sqlstore/temp_user_test.go b/pkg/services/sqlstore/temp_user_test.go
index 2a5e3e1711e..2c2b6b542fa 100644
--- a/pkg/services/sqlstore/temp_user_test.go
+++ b/pkg/services/sqlstore/temp_user_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package sqlstore
diff --git a/pkg/services/sqlstore/transactions_test.go b/pkg/services/sqlstore/transactions_test.go
index 4b4d280d7a4..5a629388fd4 100644
--- a/pkg/services/sqlstore/transactions_test.go
+++ b/pkg/services/sqlstore/transactions_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package sqlstore
diff --git a/pkg/services/sqlstore/user_test.go b/pkg/services/sqlstore/user_test.go
index 550a797ff55..ae0ed8369d8 100644
--- a/pkg/services/sqlstore/user_test.go
+++ b/pkg/services/sqlstore/user_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package sqlstore
diff --git a/pkg/tsdb/mysql/mysql_test.go b/pkg/tsdb/mysql/mysql_test.go
index 2ffccddfece..1881918fb88 100644
--- a/pkg/tsdb/mysql/mysql_test.go
+++ b/pkg/tsdb/mysql/mysql_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package mysql
diff --git a/pkg/tsdb/postgres/postgres_test.go b/pkg/tsdb/postgres/postgres_test.go
index 79425cafdc5..f581b0fc240 100644
--- a/pkg/tsdb/postgres/postgres_test.go
+++ b/pkg/tsdb/postgres/postgres_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package postgres