diff --git a/src/log/log_unix.go b/src/log/log_unix.go
index 94432f80..30007256 100644
--- a/src/log/log_unix.go
+++ b/src/log/log_unix.go
@@ -11,6 +11,7 @@
 // either express or implied. See the License for the specific language governing
 // permissions and limitations under the License.
 
+//go:build darwin || freebsd || linux || netbsd || openbsd
 // +build darwin freebsd linux netbsd openbsd
 
 // Package log is used to initialize logger
diff --git a/src/log/log_windows.go b/src/log/log_windows.go
index 9d1dec3f..3fd882b3 100644
--- a/src/log/log_windows.go
+++ b/src/log/log_windows.go
@@ -11,6 +11,7 @@
 // either express or implied. See the License for the specific language governing
 // permissions and limitations under the License.
 
+//go:build windows
 // +build windows
 
 // Package log is used to initialize logger
diff --git a/src/sessionmanagerplugin/session/sessionutil/control_signals_unix.go b/src/sessionmanagerplugin/session/sessionutil/control_signals_unix.go
index e616cfb4..71fd02c3 100644
--- a/src/sessionmanagerplugin/session/sessionutil/control_signals_unix.go
+++ b/src/sessionmanagerplugin/session/sessionutil/control_signals_unix.go
@@ -11,6 +11,7 @@
 // either express or implied. See the License for the specific language governing
 // permissions and limitations under the License.
 
+//go:build darwin || freebsd || linux || netbsd || openbsd
 // +build darwin freebsd linux netbsd openbsd
 
 // Package sessionutil contains utility methods required to start session.
diff --git a/src/sessionmanagerplugin/session/sessionutil/control_signals_windows.go b/src/sessionmanagerplugin/session/sessionutil/control_signals_windows.go
index 111ef55b..9cf4a856 100644
--- a/src/sessionmanagerplugin/session/sessionutil/control_signals_windows.go
+++ b/src/sessionmanagerplugin/session/sessionutil/control_signals_windows.go
@@ -11,6 +11,7 @@
 // either express or implied. See the License for the specific language governing
 // permissions and limitations under the License.
 
+//go:build windows
 // +build windows
 
 // Package sessionutil contains utility methods required to start session.
diff --git a/src/sessionmanagerplugin/session/sessionutil/sessionutil_unix.go b/src/sessionmanagerplugin/session/sessionutil/sessionutil_unix.go
index b613c7d5..e698c964 100644
--- a/src/sessionmanagerplugin/session/sessionutil/sessionutil_unix.go
+++ b/src/sessionmanagerplugin/session/sessionutil/sessionutil_unix.go
@@ -11,6 +11,7 @@
 // either express or implied. See the License for the specific language governing
 // permissions and limitations under the License.
 
+//go:build darwin || freebsd || linux || netbsd || openbsd
 // +build darwin freebsd linux netbsd openbsd
 
 // Package sessionutil provides utility for sessions.
diff --git a/src/sessionmanagerplugin/session/sessionutil/sessionutil_windows.go b/src/sessionmanagerplugin/session/sessionutil/sessionutil_windows.go
index 50b0df42..2b3e10e1 100644
--- a/src/sessionmanagerplugin/session/sessionutil/sessionutil_windows.go
+++ b/src/sessionmanagerplugin/session/sessionutil/sessionutil_windows.go
@@ -11,6 +11,7 @@
 // either express or implied. See the License for the specific language governing
 // permissions and limitations under the License.
 
+//go:build windows
 // +build windows
 
 // Package sessionutil provides utility for sessions.
diff --git a/src/sessionmanagerplugin/session/shellsession/shellsession_unix.go b/src/sessionmanagerplugin/session/shellsession/shellsession_unix.go
index 71b44aa1..d6cc6219 100644
--- a/src/sessionmanagerplugin/session/shellsession/shellsession_unix.go
+++ b/src/sessionmanagerplugin/session/shellsession/shellsession_unix.go
@@ -11,6 +11,7 @@
 // either express or implied. See the License for the specific language governing
 // permissions and limitations under the License.
 
+//go:build darwin || freebsd || linux || netbsd || openbsd
 // +build darwin freebsd linux netbsd openbsd
 
 // Package shellsession starts shell session.
diff --git a/src/sessionmanagerplugin/session/shellsession/shellsession_windows.go b/src/sessionmanagerplugin/session/shellsession/shellsession_windows.go
index 5246eb9f..f46b46d4 100644
--- a/src/sessionmanagerplugin/session/shellsession/shellsession_windows.go
+++ b/src/sessionmanagerplugin/session/shellsession/shellsession_windows.go
@@ -11,6 +11,7 @@
 // either express or implied. See the License for the specific language governing
 // permissions and limitations under the License.
 
+//go:build windows
 // +build windows
 
 // Package shellsession starts shell session.