diff --git a/cli-plugins/manager/error.go b/cli-plugins/manager/error.go
index f7dc6c7c55..cb0bbb5abd 100644
--- a/cli-plugins/manager/error.go
+++ b/cli-plugins/manager/error.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package manager
 
diff --git a/cli/command/cli.go b/cli/command/cli.go
index dacd1a1109..722901e060 100644
--- a/cli/command/cli.go
+++ b/cli/command/cli.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package command
 
diff --git a/cli/command/config/inspect.go b/cli/command/config/inspect.go
index 2985823f1d..7ae4a4c404 100644
--- a/cli/command/config/inspect.go
+++ b/cli/command/config/inspect.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package config
 
diff --git a/cli/command/container/inspect.go b/cli/command/container/inspect.go
index 1f404ac7ea..23b33b59fd 100644
--- a/cli/command/container/inspect.go
+++ b/cli/command/container/inspect.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package container
 
diff --git a/cli/command/context.go b/cli/command/context.go
index af2298bb50..404a6a13ea 100644
--- a/cli/command/context.go
+++ b/cli/command/context.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package command
 
diff --git a/cli/command/context/create.go b/cli/command/context/create.go
index 3f2cefeabc..a77151c252 100644
--- a/cli/command/context/create.go
+++ b/cli/command/context/create.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package context
 
diff --git a/cli/command/context/create_test.go b/cli/command/context/create_test.go
index 8f9a2bc8c2..41e18f4804 100644
--- a/cli/command/context/create_test.go
+++ b/cli/command/context/create_test.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package context
 
diff --git a/cli/command/context/inspect.go b/cli/command/context/inspect.go
index 7302a6e33d..3794b417c4 100644
--- a/cli/command/context/inspect.go
+++ b/cli/command/context/inspect.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package context
 
diff --git a/cli/command/context/list.go b/cli/command/context/list.go
index 83d48927ae..23402e8664 100644
--- a/cli/command/context/list.go
+++ b/cli/command/context/list.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package context
 
diff --git a/cli/command/context_test.go b/cli/command/context_test.go
index bf5ecf7dd3..8bfd89b564 100644
--- a/cli/command/context_test.go
+++ b/cli/command/context_test.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package command
 
diff --git a/cli/command/defaultcontextstore.go b/cli/command/defaultcontextstore.go
index 2582257680..c5b310e980 100644
--- a/cli/command/defaultcontextstore.go
+++ b/cli/command/defaultcontextstore.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package command
 
diff --git a/cli/command/defaultcontextstore_test.go b/cli/command/defaultcontextstore_test.go
index 8f14f7e121..8fb8426e48 100644
--- a/cli/command/defaultcontextstore_test.go
+++ b/cli/command/defaultcontextstore_test.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package command
 
diff --git a/cli/command/formatter/container.go b/cli/command/formatter/container.go
index 820e9ad126..ba62efb2f4 100644
--- a/cli/command/formatter/container.go
+++ b/cli/command/formatter/container.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package formatter
 
diff --git a/cli/command/formatter/container_test.go b/cli/command/formatter/container_test.go
index 65ff2eb11d..df2639bf00 100644
--- a/cli/command/formatter/container_test.go
+++ b/cli/command/formatter/container_test.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package formatter
 
diff --git a/cli/command/formatter/custom.go b/cli/command/formatter/custom.go
index ee7d14830e..043e268dbe 100644
--- a/cli/command/formatter/custom.go
+++ b/cli/command/formatter/custom.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package formatter
 
diff --git a/cli/command/formatter/formatter.go b/cli/command/formatter/formatter.go
index 4f10377255..5873cce8d4 100644
--- a/cli/command/formatter/formatter.go
+++ b/cli/command/formatter/formatter.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package formatter
 
diff --git a/cli/command/formatter/formatter_test.go b/cli/command/formatter/formatter_test.go
index c0af96d302..7a95f2112e 100644
--- a/cli/command/formatter/formatter_test.go
+++ b/cli/command/formatter/formatter_test.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package formatter
 
diff --git a/cli/command/formatter/reflect.go b/cli/command/formatter/reflect.go
index e2c0b28f53..fe8def610b 100644
--- a/cli/command/formatter/reflect.go
+++ b/cli/command/formatter/reflect.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package formatter
 
diff --git a/cli/command/formatter/reflect_test.go b/cli/command/formatter/reflect_test.go
index b68bad94ad..79737ec5f7 100644
--- a/cli/command/formatter/reflect_test.go
+++ b/cli/command/formatter/reflect_test.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package formatter
 
diff --git a/cli/command/formatter/volume_test.go b/cli/command/formatter/volume_test.go
index f27ad17437..a0ab5134c9 100644
--- a/cli/command/formatter/volume_test.go
+++ b/cli/command/formatter/volume_test.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package formatter
 
diff --git a/cli/command/idresolver/idresolver.go b/cli/command/idresolver/idresolver.go
index 802ff46fe1..f73eb16e2c 100644
--- a/cli/command/idresolver/idresolver.go
+++ b/cli/command/idresolver/idresolver.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package idresolver
 
diff --git a/cli/command/image/inspect.go b/cli/command/image/inspect.go
index 90fc670400..b0e4fba527 100644
--- a/cli/command/image/inspect.go
+++ b/cli/command/image/inspect.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package image
 
diff --git a/cli/command/image/push.go b/cli/command/image/push.go
index 92ef1a159a..9ad2abd1ff 100644
--- a/cli/command/image/push.go
+++ b/cli/command/image/push.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package image
 
diff --git a/cli/command/inspect/inspector.go b/cli/command/inspect/inspector.go
index d618e9214b..46ba8750d6 100644
--- a/cli/command/inspect/inspector.go
+++ b/cli/command/inspect/inspector.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package inspect
 
diff --git a/cli/command/network/formatter_test.go b/cli/command/network/formatter_test.go
index 018f789b17..8c61bffb9a 100644
--- a/cli/command/network/formatter_test.go
+++ b/cli/command/network/formatter_test.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package network
 
diff --git a/cli/command/network/inspect.go b/cli/command/network/inspect.go
index 72f66382fa..73b7a79e2e 100644
--- a/cli/command/network/inspect.go
+++ b/cli/command/network/inspect.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package network
 
diff --git a/cli/command/node/formatter_test.go b/cli/command/node/formatter_test.go
index 4eb172a934..8612445697 100644
--- a/cli/command/node/formatter_test.go
+++ b/cli/command/node/formatter_test.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package node
 
diff --git a/cli/command/node/inspect.go b/cli/command/node/inspect.go
index 3ad98ef8b1..270a14bd2b 100644
--- a/cli/command/node/inspect.go
+++ b/cli/command/node/inspect.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package node
 
diff --git a/cli/command/plugin/formatter_test.go b/cli/command/plugin/formatter_test.go
index 642ee2afc4..438d53b02d 100644
--- a/cli/command/plugin/formatter_test.go
+++ b/cli/command/plugin/formatter_test.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package plugin
 
diff --git a/cli/command/plugin/inspect.go b/cli/command/plugin/inspect.go
index d910dc6e8f..21ff99d9c7 100644
--- a/cli/command/plugin/inspect.go
+++ b/cli/command/plugin/inspect.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package plugin
 
diff --git a/cli/command/secret/inspect.go b/cli/command/secret/inspect.go
index df448155ec..5559d43d38 100644
--- a/cli/command/secret/inspect.go
+++ b/cli/command/secret/inspect.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package secret
 
diff --git a/cli/command/service/formatter_test.go b/cli/command/service/formatter_test.go
index cc74bfe6fa..a07ed4c6d8 100644
--- a/cli/command/service/formatter_test.go
+++ b/cli/command/service/formatter_test.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package service
 
diff --git a/cli/command/service/inspect.go b/cli/command/service/inspect.go
index fcd85c1209..28b957f773 100644
--- a/cli/command/service/inspect.go
+++ b/cli/command/service/inspect.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package service
 
diff --git a/cli/command/service/inspect_test.go b/cli/command/service/inspect_test.go
index cd088c77a2..b1da0dafaf 100644
--- a/cli/command/service/inspect_test.go
+++ b/cli/command/service/inspect_test.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package service
 
diff --git a/cli/command/service/opts.go b/cli/command/service/opts.go
index 79f545445a..9298cfb131 100644
--- a/cli/command/service/opts.go
+++ b/cli/command/service/opts.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package service
 
diff --git a/cli/command/stack/loader/loader.go b/cli/command/stack/loader/loader.go
index 7521d0471d..5608a81c8f 100644
--- a/cli/command/stack/loader/loader.go
+++ b/cli/command/stack/loader/loader.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package loader
 
diff --git a/cli/command/system/info.go b/cli/command/system/info.go
index 8ec19521d8..108a65a5f1 100644
--- a/cli/command/system/info.go
+++ b/cli/command/system/info.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package system
 
diff --git a/cli/command/system/inspect.go b/cli/command/system/inspect.go
index e0133ba7a4..0af387946f 100644
--- a/cli/command/system/inspect.go
+++ b/cli/command/system/inspect.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package system
 
diff --git a/cli/command/telemetry_docker.go b/cli/command/telemetry_docker.go
index c3612a7e0c..298209e2ba 100644
--- a/cli/command/telemetry_docker.go
+++ b/cli/command/telemetry_docker.go
@@ -1,5 +1,5 @@
-// FIXME(jsternberg): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.21
+// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
+//go:build go1.22
 
 package command
 
diff --git a/cli/command/trust/inspect.go b/cli/command/trust/inspect.go
index 3de90b4e6f..6de7866234 100644
--- a/cli/command/trust/inspect.go
+++ b/cli/command/trust/inspect.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package trust
 
diff --git a/cli/command/utils.go b/cli/command/utils.go
index 73b61b3460..8a8368fbaa 100644
--- a/cli/command/utils.go
+++ b/cli/command/utils.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package command
 
diff --git a/cli/command/volume/inspect.go b/cli/command/volume/inspect.go
index bebc24213d..015a8040d8 100644
--- a/cli/command/volume/inspect.go
+++ b/cli/command/volume/inspect.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package volume
 
diff --git a/cli/compose/interpolation/interpolation.go b/cli/compose/interpolation/interpolation.go
index 42aefc6620..ee11656f60 100644
--- a/cli/compose/interpolation/interpolation.go
+++ b/cli/compose/interpolation/interpolation.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package interpolation
 
diff --git a/cli/compose/interpolation/interpolation_test.go b/cli/compose/interpolation/interpolation_test.go
index 21fd359c42..cc7ffacabb 100644
--- a/cli/compose/interpolation/interpolation_test.go
+++ b/cli/compose/interpolation/interpolation_test.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package interpolation
 
diff --git a/cli/compose/loader/full-struct_test.go b/cli/compose/loader/full-struct_test.go
index e362041540..2aa512d097 100644
--- a/cli/compose/loader/full-struct_test.go
+++ b/cli/compose/loader/full-struct_test.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package loader
 
diff --git a/cli/compose/loader/interpolate.go b/cli/compose/loader/interpolate.go
index 68d3b8c329..82c36d7dca 100644
--- a/cli/compose/loader/interpolate.go
+++ b/cli/compose/loader/interpolate.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package loader
 
diff --git a/cli/compose/loader/loader.go b/cli/compose/loader/loader.go
index ecf86af9b3..7bc420b2b1 100644
--- a/cli/compose/loader/loader.go
+++ b/cli/compose/loader/loader.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package loader
 
diff --git a/cli/compose/loader/loader_test.go b/cli/compose/loader/loader_test.go
index c1d7af3641..b173e61812 100644
--- a/cli/compose/loader/loader_test.go
+++ b/cli/compose/loader/loader_test.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package loader
 
diff --git a/cli/compose/loader/merge.go b/cli/compose/loader/merge.go
index 15fc69b853..ee0a39f913 100644
--- a/cli/compose/loader/merge.go
+++ b/cli/compose/loader/merge.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package loader
 
diff --git a/cli/compose/loader/merge_test.go b/cli/compose/loader/merge_test.go
index 4d145cc7df..9d5a1dd6cd 100644
--- a/cli/compose/loader/merge_test.go
+++ b/cli/compose/loader/merge_test.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package loader
 
diff --git a/cli/compose/schema/schema.go b/cli/compose/schema/schema.go
index 129e116d19..9c68166e37 100644
--- a/cli/compose/schema/schema.go
+++ b/cli/compose/schema/schema.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package schema
 
diff --git a/cli/compose/schema/schema_test.go b/cli/compose/schema/schema_test.go
index 9738494156..8993443d9c 100644
--- a/cli/compose/schema/schema_test.go
+++ b/cli/compose/schema/schema_test.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package schema
 
diff --git a/cli/compose/template/template.go b/cli/compose/template/template.go
index d97e162b0e..1507c0ee6e 100644
--- a/cli/compose/template/template.go
+++ b/cli/compose/template/template.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package template
 
diff --git a/cli/compose/template/template_test.go b/cli/compose/template/template_test.go
index 5482342f80..92b95460eb 100644
--- a/cli/compose/template/template_test.go
+++ b/cli/compose/template/template_test.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package template
 
diff --git a/cli/compose/types/types.go b/cli/compose/types/types.go
index 2b929f4d7f..55b80365fe 100644
--- a/cli/compose/types/types.go
+++ b/cli/compose/types/types.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package types
 
diff --git a/cli/context/store/metadata_test.go b/cli/context/store/metadata_test.go
index b37ced0345..3d3a6606ad 100644
--- a/cli/context/store/metadata_test.go
+++ b/cli/context/store/metadata_test.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package store
 
diff --git a/cli/context/store/metadatastore.go b/cli/context/store/metadatastore.go
index 0c6986fa75..6b8975a4ac 100644
--- a/cli/context/store/metadatastore.go
+++ b/cli/context/store/metadatastore.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package store
 
diff --git a/cli/context/store/store.go b/cli/context/store/store.go
index 066b5769d7..3643e57659 100644
--- a/cli/context/store/store.go
+++ b/cli/context/store/store.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package store
 
diff --git a/cli/context/store/store_test.go b/cli/context/store/store_test.go
index c785b2e015..0f00f4a941 100644
--- a/cli/context/store/store_test.go
+++ b/cli/context/store/store_test.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package store
 
diff --git a/cli/context/store/storeconfig.go b/cli/context/store/storeconfig.go
index aa516a191e..bfd5e6fcd4 100644
--- a/cli/context/store/storeconfig.go
+++ b/cli/context/store/storeconfig.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package store
 
diff --git a/cli/context/store/storeconfig_test.go b/cli/context/store/storeconfig_test.go
index 22d40e8521..da3d7e9e75 100644
--- a/cli/context/store/storeconfig_test.go
+++ b/cli/context/store/storeconfig_test.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package store
 
diff --git a/cli/internal/oauth/api/api.go b/cli/internal/oauth/api/api.go
index cf6c1be961..98c981f029 100644
--- a/cli/internal/oauth/api/api.go
+++ b/cli/internal/oauth/api/api.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package api
 
diff --git a/cmd/docker/builder_test.go b/cmd/docker/builder_test.go
index 72b1ffab30..5f7875ff83 100644
--- a/cmd/docker/builder_test.go
+++ b/cmd/docker/builder_test.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package main
 
diff --git a/templates/templates.go b/templates/templates.go
index 572ece8be7..da2354cab7 100644
--- a/templates/templates.go
+++ b/templates/templates.go
@@ -1,5 +1,5 @@
 // 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
+//go:build go1.22
 
 package templates