diff --git a/api/server/router/grpc/grpc.go b/api/server/router/grpc/grpc.go
index 2a74f50ea7..7f26f06b7d 100644
--- a/api/server/router/grpc/grpc.go
+++ b/api/server/router/grpc/grpc.go
@@ -1,3 +1,6 @@
+// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
+//go:build go1.21
+
 package grpc // import "github.com/docker/docker/api/server/router/grpc"
 
 import (
diff --git a/container/view.go b/container/view.go
index 949bafa424..0f77aa58ca 100644
--- a/container/view.go
+++ b/container/view.go
@@ -1,3 +1,6 @@
+// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
+//go:build go1.21
+
 package container // import "github.com/docker/docker/container"
 
 import (
diff --git a/libnetwork/drivers/bridge/port_mapping_linux.go b/libnetwork/drivers/bridge/port_mapping_linux.go
index 072f94be56..2f1b11d9aa 100644
--- a/libnetwork/drivers/bridge/port_mapping_linux.go
+++ b/libnetwork/drivers/bridge/port_mapping_linux.go
@@ -1,3 +1,6 @@
+// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
+//go:build go1.21
+
 package bridge
 
 import (
diff --git a/libnetwork/ipams/defaultipam/address_space.go b/libnetwork/ipams/defaultipam/address_space.go
index 92f886dcc9..44616f49ce 100644
--- a/libnetwork/ipams/defaultipam/address_space.go
+++ b/libnetwork/ipams/defaultipam/address_space.go
@@ -1,3 +1,6 @@
+// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
+//go:build go1.21
+
 package defaultipam
 
 import (
diff --git a/libnetwork/ipamutils/utils.go b/libnetwork/ipamutils/utils.go
index 725f678f6e..8454c76087 100644
--- a/libnetwork/ipamutils/utils.go
+++ b/libnetwork/ipamutils/utils.go
@@ -1,3 +1,6 @@
+// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
+//go:build go1.21
+
 // Package ipamutils provides utility functions for ipam management
 package ipamutils
 
diff --git a/libnetwork/netutils/utils.go b/libnetwork/netutils/utils.go
index 5db4b137c8..b3ce949876 100644
--- a/libnetwork/netutils/utils.go
+++ b/libnetwork/netutils/utils.go
@@ -1,5 +1,4 @@
-// Network utility functions.
-
+// Package netutils provides network utility functions.
 package netutils
 
 import (
diff --git a/libnetwork/netutils/utils_linux.go b/libnetwork/netutils/utils_linux.go
index 491f32107c..fb7e864211 100644
--- a/libnetwork/netutils/utils_linux.go
+++ b/libnetwork/netutils/utils_linux.go
@@ -1,6 +1,5 @@
-//go:build linux
-
-// Network utility functions.
+// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
+//go:build go1.21 && linux
 
 package netutils
 
diff --git a/libnetwork/portallocator/portallocator.go b/libnetwork/portallocator/portallocator.go
index 4bf89d6e89..0df927748a 100644
--- a/libnetwork/portallocator/portallocator.go
+++ b/libnetwork/portallocator/portallocator.go
@@ -1,3 +1,6 @@
+// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
+//go:build go1.21
+
 package portallocator
 
 import (