diff --git a/cmd/daemon_cgo.go b/cmd/daemon_cgo.go
index 922adf6..ba5a5e8 100644
--- a/cmd/daemon_cgo.go
+++ b/cmd/daemon_cgo.go
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 // Only include cephstore when building with cgo.
+//go:build cgo
 // +build cgo
 
 package cmd
diff --git a/pkg/api/client/client_unix.go b/pkg/api/client/client_unix.go
index 572c5f8..c21cd64 100644
--- a/pkg/api/client/client_unix.go
+++ b/pkg/api/client/client_unix.go
@@ -1,3 +1,4 @@
+//go:build linux || freebsd || solaris || openbsd
 // +build linux freebsd solaris openbsd
 
 package client
diff --git a/pkg/api/client/transport/cancellable/canceler.go b/pkg/api/client/transport/cancellable/canceler.go
index ff8c612..a7e499a 100644
--- a/pkg/api/client/transport/cancellable/canceler.go
+++ b/pkg/api/client/transport/cancellable/canceler.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build go1.5
 // +build go1.5
 
 package cancellable
diff --git a/pkg/api/client/transport/cancellable/canceler_go14.go b/pkg/api/client/transport/cancellable/canceler_go14.go
index 61653e4..1a738d2 100644
--- a/pkg/api/client/transport/cancellable/canceler_go14.go
+++ b/pkg/api/client/transport/cancellable/canceler_go14.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build !go1.5
 // +build !go1.5
 
 package cancellable
diff --git a/pkg/homedir/lookup_unix.go b/pkg/homedir/lookup_unix.go
index ac1347c..9c547f2 100644
--- a/pkg/homedir/lookup_unix.go
+++ b/pkg/homedir/lookup_unix.go
@@ -1,3 +1,4 @@
+//go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
 // +build darwin dragonfly freebsd linux netbsd openbsd solaris
 
 package homedir
diff --git a/pkg/homedir/lookup_unsupported.go b/pkg/homedir/lookup_unsupported.go
index 162ce73..d90bc58 100644
--- a/pkg/homedir/lookup_unsupported.go
+++ b/pkg/homedir/lookup_unsupported.go
@@ -1,3 +1,4 @@
+//go:build !darwin && !dragonfly && !freebsd && !linux && !netbsd && !openbsd && !solaris
 // +build !darwin,!dragonfly,!freebsd,!linux,!netbsd,!openbsd,!solaris
 
 package homedir
diff --git a/pkg/util/util_darwin.go b/pkg/util/util_darwin.go
index 2463f41..619d4c9 100644
--- a/pkg/util/util_darwin.go
+++ b/pkg/util/util_darwin.go
@@ -1,4 +1,6 @@
+//go:build darwin
 // +build darwin
+
 /*
 Copyright 2016 The GoStor Authors All rights reserved.
 
diff --git a/pkg/util/util_linux.go b/pkg/util/util_linux.go
index 95b233b..32b8476 100644
--- a/pkg/util/util_linux.go
+++ b/pkg/util/util_linux.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*