diff --git a/libimage/copier.go b/libimage/copier.go
index 9dcc48d24..d6acc7325 100644
--- a/libimage/copier.go
+++ b/libimage/copier.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/libimage/corrupted_test.go b/libimage/corrupted_test.go
index eb7291d37..3438a6779 100644
--- a/libimage/corrupted_test.go
+++ b/libimage/corrupted_test.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/libimage/disk_usage.go b/libimage/disk_usage.go
index f27edc03b..765b0df86 100644
--- a/libimage/disk_usage.go
+++ b/libimage/disk_usage.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/libimage/events.go b/libimage/events.go
index c7733564d..5d82efa6a 100644
--- a/libimage/events.go
+++ b/libimage/events.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/libimage/filters.go b/libimage/filters.go
index 9a8663e35..b51853af1 100644
--- a/libimage/filters.go
+++ b/libimage/filters.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/libimage/filters_test.go b/libimage/filters_test.go
index 82ac6f6f1..e2a41033d 100644
--- a/libimage/filters_test.go
+++ b/libimage/filters_test.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/libimage/history.go b/libimage/history.go
index 1e3fa3214..ccd810962 100644
--- a/libimage/history.go
+++ b/libimage/history.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/libimage/history_test.go b/libimage/history_test.go
index 0102a0920..79a201b1c 100644
--- a/libimage/history_test.go
+++ b/libimage/history_test.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/libimage/image.go b/libimage/image.go
index cc77fc34e..4d106d42f 100644
--- a/libimage/image.go
+++ b/libimage/image.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/libimage/image_config.go b/libimage/image_config.go
index 69b7debd0..9f5841fe1 100644
--- a/libimage/image_config.go
+++ b/libimage/image_config.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/libimage/image_test.go b/libimage/image_test.go
index f12a546ad..d80b4a23a 100644
--- a/libimage/image_test.go
+++ b/libimage/image_test.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/libimage/image_tree.go b/libimage/image_tree.go
index 9c958ce6b..8143d3779 100644
--- a/libimage/image_tree.go
+++ b/libimage/image_tree.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/libimage/import.go b/libimage/import.go
index b276c3659..5519f02ba 100644
--- a/libimage/import.go
+++ b/libimage/import.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/libimage/import_test.go b/libimage/import_test.go
index d4ae4d0b3..0e984c4bd 100644
--- a/libimage/import_test.go
+++ b/libimage/import_test.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/libimage/inspect.go b/libimage/inspect.go
index c6632d9a2..1003b6483 100644
--- a/libimage/inspect.go
+++ b/libimage/inspect.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/libimage/layer_tree.go b/libimage/layer_tree.go
index c34b71a87..71eafb0e7 100644
--- a/libimage/layer_tree.go
+++ b/libimage/layer_tree.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/libimage/load.go b/libimage/load.go
index 72c56f122..36283a99b 100644
--- a/libimage/load.go
+++ b/libimage/load.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/libimage/load_test.go b/libimage/load_test.go
index 5198acd45..49d94fe3c 100644
--- a/libimage/load_test.go
+++ b/libimage/load_test.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/libimage/manifest_list.go b/libimage/manifest_list.go
index 6fed12d74..c36bfda96 100644
--- a/libimage/manifest_list.go
+++ b/libimage/manifest_list.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/libimage/manifest_list_test.go b/libimage/manifest_list_test.go
index f2053a5d3..d5c775f94 100644
--- a/libimage/manifest_list_test.go
+++ b/libimage/manifest_list_test.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/libimage/normalize.go b/libimage/normalize.go
index 9619b1a0d..2b3402861 100644
--- a/libimage/normalize.go
+++ b/libimage/normalize.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/libimage/normalize_test.go b/libimage/normalize_test.go
index 50583d9ad..be6b9e40d 100644
--- a/libimage/normalize_test.go
+++ b/libimage/normalize_test.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/libimage/oci.go b/libimage/oci.go
index b88d6613d..fcbd10ada 100644
--- a/libimage/oci.go
+++ b/libimage/oci.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/libimage/platform.go b/libimage/platform.go
index fc0e002fa..c378bc27f 100644
--- a/libimage/platform.go
+++ b/libimage/platform.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/libimage/pull.go b/libimage/pull.go
index 579eae2c0..bc8e84981 100644
--- a/libimage/pull.go
+++ b/libimage/pull.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/libimage/pull_test.go b/libimage/pull_test.go
index 94695ac2c..b40f9eb61 100644
--- a/libimage/pull_test.go
+++ b/libimage/pull_test.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/libimage/push.go b/libimage/push.go
index 7203838aa..ed1d90c14 100644
--- a/libimage/push.go
+++ b/libimage/push.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/libimage/push_test.go b/libimage/push_test.go
index 589c4a0ee..b2c3fe637 100644
--- a/libimage/push_test.go
+++ b/libimage/push_test.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/libimage/remove_test.go b/libimage/remove_test.go
index c2bae3b1e..433c829e9 100644
--- a/libimage/remove_test.go
+++ b/libimage/remove_test.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/libimage/runtime.go b/libimage/runtime.go
index 33f515e99..1948fe0ad 100644
--- a/libimage/runtime.go
+++ b/libimage/runtime.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/libimage/runtime_test.go b/libimage/runtime_test.go
index 04d6fa480..91faaf98a 100644
--- a/libimage/runtime_test.go
+++ b/libimage/runtime_test.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/libimage/save.go b/libimage/save.go
index a42bbb497..47a3a566b 100644
--- a/libimage/save.go
+++ b/libimage/save.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/libimage/save_test.go b/libimage/save_test.go
index 38ab8a0a7..79bd4c7f3 100644
--- a/libimage/save_test.go
+++ b/libimage/save_test.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/libimage/search.go b/libimage/search.go
index 618850e6e..9ef0e8320 100644
--- a/libimage/search.go
+++ b/libimage/search.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (