diff --git a/cmd/podman-testing/create.go b/cmd/podman-testing/create.go
index 1bdd14c5f9..99cb291771 100644
--- a/cmd/podman-testing/create.go
+++ b/cmd/podman-testing/create.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package main
 
 import (
diff --git a/cmd/podman-testing/data.go b/cmd/podman-testing/data.go
index 6fe2099c00..81333cba3f 100644
--- a/cmd/podman-testing/data.go
+++ b/cmd/podman-testing/data.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package main
 
 import (
diff --git a/cmd/podman-testing/layer.go b/cmd/podman-testing/layer.go
index ae4de28ca1..2b21ae2f6d 100644
--- a/cmd/podman-testing/layer.go
+++ b/cmd/podman-testing/layer.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package main
 
 import (
diff --git a/cmd/podman-testing/main.go b/cmd/podman-testing/main.go
index ccc1ff7454..e883a6b84e 100644
--- a/cmd/podman-testing/main.go
+++ b/cmd/podman-testing/main.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package main
 
 import (
diff --git a/cmd/podman-testing/remove.go b/cmd/podman-testing/remove.go
index 59dadfd2d0..90efefa587 100644
--- a/cmd/podman-testing/remove.go
+++ b/cmd/podman-testing/remove.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package main
 
 import (
diff --git a/cmd/podman-testing/store_supported.go b/cmd/podman-testing/store_supported.go
index b8e2fac5a7..8931930e13 100644
--- a/cmd/podman-testing/store_supported.go
+++ b/cmd/podman-testing/store_supported.go
@@ -1,5 +1,4 @@
 //go:build linux && !remote
-// +build linux,!remote
 
 package main
 
diff --git a/cmd/podman-testing/store_unsupported.go b/cmd/podman-testing/store_unsupported.go
deleted file mode 100644
index de79ed88b0..0000000000
--- a/cmd/podman-testing/store_unsupported.go
+++ /dev/null
@@ -1,16 +0,0 @@
-//go:build !linux || remote
-// +build !linux remote
-
-package main
-
-import "github.com/containers/podman/v5/pkg/domain/entities"
-
-const engineMode = entities.TunnelMode
-
-func storeBefore() error {
-	return nil
-}
-
-func storeAfter() error {
-	return nil
-}
diff --git a/cmd/podman/containers/commit.go b/cmd/podman/containers/commit.go
index b0cf44fe6d..40e816f650 100644
--- a/cmd/podman/containers/commit.go
+++ b/cmd/podman/containers/commit.go
@@ -9,7 +9,6 @@ import (
 	"github.com/containers/common/pkg/completion"
 	"github.com/containers/podman/v5/cmd/podman/common"
 	"github.com/containers/podman/v5/cmd/podman/registry"
-	"github.com/containers/podman/v5/pkg/api/handlers"
 	"github.com/containers/podman/v5/pkg/domain/entities"
 	"github.com/spf13/cobra"
 )
@@ -105,9 +104,6 @@ func commit(cmd *cobra.Command, args []string) error {
 	if !commitOptions.Quiet {
 		commitOptions.Writer = os.Stderr
 	}
-	if len(commitOptions.Changes) > 0 {
-		commitOptions.Changes = handlers.DecodeChanges(commitOptions.Changes)
-	}
 	if len(configFile) > 0 {
 		cfg, err := os.ReadFile(configFile)
 		if err != nil {
diff --git a/internal/domain/entities/engine_testing.go b/internal/domain/entities/engine_testing.go
index 9ad9ee18bb..28c78a46a5 100644
--- a/internal/domain/entities/engine_testing.go
+++ b/internal/domain/entities/engine_testing.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package entities
 
 import (
diff --git a/internal/domain/entities/testing.go b/internal/domain/entities/testing.go
index 754c4927e7..caba5e61ef 100644
--- a/internal/domain/entities/testing.go
+++ b/internal/domain/entities/testing.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package entities
 
 type CreateStorageLayerOptions struct {
diff --git a/internal/domain/infra/abi/testing.go b/internal/domain/infra/abi/testing.go
index 4cf49d0801..f617656dbd 100644
--- a/internal/domain/infra/abi/testing.go
+++ b/internal/domain/infra/abi/testing.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package abi
 
 import (
diff --git a/internal/domain/infra/abi/testing_test.go b/internal/domain/infra/abi/testing_test.go
index 75c6f4f542..dbad5489d6 100644
--- a/internal/domain/infra/abi/testing_test.go
+++ b/internal/domain/infra/abi/testing_test.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package abi
 
 import "github.com/containers/podman/v5/internal/domain/entities"
diff --git a/internal/domain/infra/runtime_tunnel.go b/internal/domain/infra/runtime_tunnel.go
deleted file mode 100644
index 5bade4eddc..0000000000
--- a/internal/domain/infra/runtime_tunnel.go
+++ /dev/null
@@ -1,25 +0,0 @@
-//go:build remote
-
-package infra
-
-import (
-	"context"
-	"fmt"
-
-	ientities "github.com/containers/podman/v5/internal/domain/entities"
-	"github.com/containers/podman/v5/internal/domain/infra/tunnel"
-	"github.com/containers/podman/v5/pkg/bindings"
-	"github.com/containers/podman/v5/pkg/domain/entities"
-)
-
-// NewTestingEngine factory provides a libpod runtime for testing-specific operations
-func NewTestingEngine(facts *entities.PodmanConfig) (ientities.TestingEngine, error) {
-	switch facts.EngineMode {
-	case entities.ABIMode:
-		return nil, fmt.Errorf("direct image runtime not supported")
-	case entities.TunnelMode:
-		ctx, err := bindings.NewConnectionWithIdentity(context.Background(), facts.URI, facts.Identity, facts.MachineMode)
-		return &tunnel.TestingEngine{ClientCtx: ctx}, err
-	}
-	return nil, fmt.Errorf("runtime mode '%v' is not supported", facts.EngineMode)
-}
diff --git a/internal/domain/infra/tunnel/testing.go b/internal/domain/infra/tunnel/testing.go
index 8efc6c3727..66d62633ad 100644
--- a/internal/domain/infra/tunnel/testing.go
+++ b/internal/domain/infra/tunnel/testing.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package tunnel
 
 import (
diff --git a/internal/domain/infra/tunnel/testing_test.go b/internal/domain/infra/tunnel/testing_test.go
index d8cfa120f4..f803e77a1a 100644
--- a/internal/domain/infra/tunnel/testing_test.go
+++ b/internal/domain/infra/tunnel/testing_test.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package tunnel
 
 import "github.com/containers/podman/v5/internal/domain/entities"
diff --git a/pkg/api/handlers/compat/auth.go b/pkg/api/handlers/compat/auth.go
index 9364d4c6d9..162f7d6520 100644
--- a/pkg/api/handlers/compat/auth.go
+++ b/pkg/api/handlers/compat/auth.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (
diff --git a/pkg/api/handlers/compat/changes.go b/pkg/api/handlers/compat/changes.go
index 5b74ae07c3..cfcb0990f6 100644
--- a/pkg/api/handlers/compat/changes.go
+++ b/pkg/api/handlers/compat/changes.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (
diff --git a/pkg/api/handlers/compat/containers.go b/pkg/api/handlers/compat/containers.go
index dfaf6fbe73..bd883bf6f2 100644
--- a/pkg/api/handlers/compat/containers.go
+++ b/pkg/api/handlers/compat/containers.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (
diff --git a/pkg/api/handlers/compat/containers_archive.go b/pkg/api/handlers/compat/containers_archive.go
index 044ec6455e..8849641525 100644
--- a/pkg/api/handlers/compat/containers_archive.go
+++ b/pkg/api/handlers/compat/containers_archive.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (
diff --git a/pkg/api/handlers/compat/containers_attach.go b/pkg/api/handlers/compat/containers_attach.go
index 6d7295cdf2..301be134b1 100644
--- a/pkg/api/handlers/compat/containers_attach.go
+++ b/pkg/api/handlers/compat/containers_attach.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (
diff --git a/pkg/api/handlers/compat/containers_create.go b/pkg/api/handlers/compat/containers_create.go
index cef33d37dd..404c117bb6 100644
--- a/pkg/api/handlers/compat/containers_create.go
+++ b/pkg/api/handlers/compat/containers_create.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (
diff --git a/pkg/api/handlers/compat/containers_export.go b/pkg/api/handlers/compat/containers_export.go
index a95406ab7a..9cc4fd9f99 100644
--- a/pkg/api/handlers/compat/containers_export.go
+++ b/pkg/api/handlers/compat/containers_export.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (
diff --git a/pkg/api/handlers/compat/containers_logs.go b/pkg/api/handlers/compat/containers_logs.go
index 3f5f75406c..b1440ff9dd 100644
--- a/pkg/api/handlers/compat/containers_logs.go
+++ b/pkg/api/handlers/compat/containers_logs.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (
diff --git a/pkg/api/handlers/compat/containers_pause.go b/pkg/api/handlers/compat/containers_pause.go
index acd06ae420..b002d6bac8 100644
--- a/pkg/api/handlers/compat/containers_pause.go
+++ b/pkg/api/handlers/compat/containers_pause.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (
diff --git a/pkg/api/handlers/compat/containers_prune.go b/pkg/api/handlers/compat/containers_prune.go
index 30b38403b0..fe2de39358 100644
--- a/pkg/api/handlers/compat/containers_prune.go
+++ b/pkg/api/handlers/compat/containers_prune.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (
diff --git a/pkg/api/handlers/compat/containers_restart.go b/pkg/api/handlers/compat/containers_restart.go
index 3681993dde..91e8573f5f 100644
--- a/pkg/api/handlers/compat/containers_restart.go
+++ b/pkg/api/handlers/compat/containers_restart.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (
diff --git a/pkg/api/handlers/compat/containers_start.go b/pkg/api/handlers/compat/containers_start.go
index 813f5e1f1d..ef4d7c5f82 100644
--- a/pkg/api/handlers/compat/containers_start.go
+++ b/pkg/api/handlers/compat/containers_start.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (
diff --git a/pkg/api/handlers/compat/containers_stats_freebsd.go b/pkg/api/handlers/compat/containers_stats_freebsd.go
index 06490bbe90..ad48739fb9 100644
--- a/pkg/api/handlers/compat/containers_stats_freebsd.go
+++ b/pkg/api/handlers/compat/containers_stats_freebsd.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (
diff --git a/pkg/api/handlers/compat/containers_stats_linux.go b/pkg/api/handlers/compat/containers_stats_linux.go
index 6c4d5f2fbf..ccb48dc3b4 100644
--- a/pkg/api/handlers/compat/containers_stats_linux.go
+++ b/pkg/api/handlers/compat/containers_stats_linux.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (
diff --git a/pkg/api/handlers/compat/containers_stop.go b/pkg/api/handlers/compat/containers_stop.go
index b801508335..208c33f043 100644
--- a/pkg/api/handlers/compat/containers_stop.go
+++ b/pkg/api/handlers/compat/containers_stop.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (
diff --git a/pkg/api/handlers/compat/containers_top.go b/pkg/api/handlers/compat/containers_top.go
index ea72919dfc..9653906277 100644
--- a/pkg/api/handlers/compat/containers_top.go
+++ b/pkg/api/handlers/compat/containers_top.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (
diff --git a/pkg/api/handlers/compat/containers_unpause.go b/pkg/api/handlers/compat/containers_unpause.go
index 7533c5a905..70205d258e 100644
--- a/pkg/api/handlers/compat/containers_unpause.go
+++ b/pkg/api/handlers/compat/containers_unpause.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (
diff --git a/pkg/api/handlers/compat/events.go b/pkg/api/handlers/compat/events.go
index 4ab12eb022..e449aa0cab 100644
--- a/pkg/api/handlers/compat/events.go
+++ b/pkg/api/handlers/compat/events.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (
diff --git a/pkg/api/handlers/compat/exec.go b/pkg/api/handlers/compat/exec.go
index 88ccffa9f4..e7f29d727a 100644
--- a/pkg/api/handlers/compat/exec.go
+++ b/pkg/api/handlers/compat/exec.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (
diff --git a/pkg/api/handlers/compat/images.go b/pkg/api/handlers/compat/images.go
index 8dde5f1f61..a7e2701cb1 100644
--- a/pkg/api/handlers/compat/images.go
+++ b/pkg/api/handlers/compat/images.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (
@@ -137,7 +139,7 @@ func CommitContainer(w http.ResponseWriter, r *http.Request) {
 	options.Author = query.Author
 	options.Pause = query.Pause
 	options.Squash = query.Squash
-	options.Changes = handlers.DecodeChanges(query.Changes)
+	options.Changes = util.DecodeChanges(query.Changes)
 	if r.Body != nil {
 		defer r.Body.Close()
 		if options.CommitOptions.OverrideConfig, err = abi.DecodeOverrideConfig(r.Body); err != nil {
diff --git a/pkg/api/handlers/compat/images_build.go b/pkg/api/handlers/compat/images_build.go
index 920882edcf..5d59b7abb0 100644
--- a/pkg/api/handlers/compat/images_build.go
+++ b/pkg/api/handlers/compat/images_build.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (
diff --git a/pkg/api/handlers/compat/images_history.go b/pkg/api/handlers/compat/images_history.go
index 4ed97cdbe8..4d55ff4a6b 100644
--- a/pkg/api/handlers/compat/images_history.go
+++ b/pkg/api/handlers/compat/images_history.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (
diff --git a/pkg/api/handlers/compat/images_prune.go b/pkg/api/handlers/compat/images_prune.go
index 8cc303a6e2..35dbe290e0 100644
--- a/pkg/api/handlers/compat/images_prune.go
+++ b/pkg/api/handlers/compat/images_prune.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (
diff --git a/pkg/api/handlers/compat/images_push.go b/pkg/api/handlers/compat/images_push.go
index 1710006c67..319dc98a27 100644
--- a/pkg/api/handlers/compat/images_push.go
+++ b/pkg/api/handlers/compat/images_push.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (
diff --git a/pkg/api/handlers/compat/images_remove.go b/pkg/api/handlers/compat/images_remove.go
index 957a87c5ad..5dd7a56958 100644
--- a/pkg/api/handlers/compat/images_remove.go
+++ b/pkg/api/handlers/compat/images_remove.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (
diff --git a/pkg/api/handlers/compat/images_save.go b/pkg/api/handlers/compat/images_save.go
index 6314756f6b..c3022348a8 100644
--- a/pkg/api/handlers/compat/images_save.go
+++ b/pkg/api/handlers/compat/images_save.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (
diff --git a/pkg/api/handlers/compat/images_search.go b/pkg/api/handlers/compat/images_search.go
index d918929f6d..93f2c47870 100644
--- a/pkg/api/handlers/compat/images_search.go
+++ b/pkg/api/handlers/compat/images_search.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (
diff --git a/pkg/api/handlers/compat/images_tag.go b/pkg/api/handlers/compat/images_tag.go
index d210b70764..9e5dc09d0c 100644
--- a/pkg/api/handlers/compat/images_tag.go
+++ b/pkg/api/handlers/compat/images_tag.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (
diff --git a/pkg/api/handlers/compat/info.go b/pkg/api/handlers/compat/info.go
index d4c2f5f649..1f6e249b74 100644
--- a/pkg/api/handlers/compat/info.go
+++ b/pkg/api/handlers/compat/info.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (
diff --git a/pkg/api/handlers/compat/networks.go b/pkg/api/handlers/compat/networks.go
index 598645bfc0..4d31cfd2e9 100644
--- a/pkg/api/handlers/compat/networks.go
+++ b/pkg/api/handlers/compat/networks.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (
diff --git a/pkg/api/handlers/compat/ping.go b/pkg/api/handlers/compat/ping.go
index 94d2099cdd..2601788143 100644
--- a/pkg/api/handlers/compat/ping.go
+++ b/pkg/api/handlers/compat/ping.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (
diff --git a/pkg/api/handlers/compat/resize.go b/pkg/api/handlers/compat/resize.go
index 8d13d9b70c..19ce87929c 100644
--- a/pkg/api/handlers/compat/resize.go
+++ b/pkg/api/handlers/compat/resize.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (
diff --git a/pkg/api/handlers/compat/secrets.go b/pkg/api/handlers/compat/secrets.go
index 13f7508ca2..bf1cdca0f3 100644
--- a/pkg/api/handlers/compat/secrets.go
+++ b/pkg/api/handlers/compat/secrets.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (
diff --git a/pkg/api/handlers/compat/system.go b/pkg/api/handlers/compat/system.go
index d53e9c3012..e22920cbc1 100644
--- a/pkg/api/handlers/compat/system.go
+++ b/pkg/api/handlers/compat/system.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (
diff --git a/pkg/api/handlers/compat/types.go b/pkg/api/handlers/compat/types.go
index 3c42190932..2402fe7b45 100644
--- a/pkg/api/handlers/compat/types.go
+++ b/pkg/api/handlers/compat/types.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (
diff --git a/pkg/api/handlers/compat/unsupported.go b/pkg/api/handlers/compat/unsupported.go
index 31afb85bad..476502fe06 100644
--- a/pkg/api/handlers/compat/unsupported.go
+++ b/pkg/api/handlers/compat/unsupported.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (
diff --git a/pkg/api/handlers/compat/version.go b/pkg/api/handlers/compat/version.go
index 4b0af7bf79..e1c40007e7 100644
--- a/pkg/api/handlers/compat/version.go
+++ b/pkg/api/handlers/compat/version.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (
diff --git a/pkg/api/handlers/compat/volumes.go b/pkg/api/handlers/compat/volumes.go
index 4bb0a16807..943190841b 100644
--- a/pkg/api/handlers/compat/volumes.go
+++ b/pkg/api/handlers/compat/volumes.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (
diff --git a/pkg/api/handlers/decoder.go b/pkg/api/handlers/decoder.go
index 4750fa1c54..6904f4f21e 100644
--- a/pkg/api/handlers/decoder.go
+++ b/pkg/api/handlers/decoder.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package handlers
 
 import (
diff --git a/pkg/api/handlers/libpod/containers.go b/pkg/api/handlers/libpod/containers.go
index 0dabd649bb..726c30b2e7 100644
--- a/pkg/api/handlers/libpod/containers.go
+++ b/pkg/api/handlers/libpod/containers.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package libpod
 
 import (
diff --git a/pkg/api/handlers/libpod/containers_create.go b/pkg/api/handlers/libpod/containers_create.go
index 1df0bb2a40..1a12942226 100644
--- a/pkg/api/handlers/libpod/containers_create.go
+++ b/pkg/api/handlers/libpod/containers_create.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package libpod
 
 import (
diff --git a/pkg/api/handlers/libpod/containers_stats.go b/pkg/api/handlers/libpod/containers_stats.go
index 2ed2006c91..d595e3d607 100644
--- a/pkg/api/handlers/libpod/containers_stats.go
+++ b/pkg/api/handlers/libpod/containers_stats.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package libpod
 
 import (
diff --git a/pkg/api/handlers/libpod/generate.go b/pkg/api/handlers/libpod/generate.go
index 9c9ea458a9..5751369376 100644
--- a/pkg/api/handlers/libpod/generate.go
+++ b/pkg/api/handlers/libpod/generate.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package libpod
 
 import (
diff --git a/pkg/api/handlers/libpod/healthcheck.go b/pkg/api/handlers/libpod/healthcheck.go
index e5e9214051..c5ccdbac38 100644
--- a/pkg/api/handlers/libpod/healthcheck.go
+++ b/pkg/api/handlers/libpod/healthcheck.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package libpod
 
 import (
diff --git a/pkg/api/handlers/libpod/images.go b/pkg/api/handlers/libpod/images.go
index aa12e5976b..91d2b7377a 100644
--- a/pkg/api/handlers/libpod/images.go
+++ b/pkg/api/handlers/libpod/images.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package libpod
 
 import (
@@ -499,7 +501,7 @@ func CommitContainer(w http.ResponseWriter, r *http.Request) {
 	options.Author = query.Author
 	options.Pause = query.Pause
 	options.Squash = query.Squash
-	options.Changes = handlers.DecodeChanges(query.Changes)
+	options.Changes = util.DecodeChanges(query.Changes)
 	ctr, err := runtime.LookupContainer(query.Container)
 	if err != nil {
 		utils.Error(w, http.StatusNotFound, err)
diff --git a/pkg/api/handlers/libpod/images_pull.go b/pkg/api/handlers/libpod/images_pull.go
index 7075b98b64..317e33d64e 100644
--- a/pkg/api/handlers/libpod/images_pull.go
+++ b/pkg/api/handlers/libpod/images_pull.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package libpod
 
 import (
diff --git a/pkg/api/handlers/libpod/images_push.go b/pkg/api/handlers/libpod/images_push.go
index ce9d5d19e1..576f25cf64 100644
--- a/pkg/api/handlers/libpod/images_push.go
+++ b/pkg/api/handlers/libpod/images_push.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package libpod
 
 import (
diff --git a/pkg/api/handlers/libpod/info.go b/pkg/api/handlers/libpod/info.go
index 536cd51d8f..546991699b 100644
--- a/pkg/api/handlers/libpod/info.go
+++ b/pkg/api/handlers/libpod/info.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package libpod
 
 import (
diff --git a/pkg/api/handlers/libpod/kube.go b/pkg/api/handlers/libpod/kube.go
index 8d6d096ca1..7068074f3b 100644
--- a/pkg/api/handlers/libpod/kube.go
+++ b/pkg/api/handlers/libpod/kube.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package libpod
 
 import (
diff --git a/pkg/api/handlers/libpod/manifests.go b/pkg/api/handlers/libpod/manifests.go
index df0b1ba733..d6db94dbd8 100644
--- a/pkg/api/handlers/libpod/manifests.go
+++ b/pkg/api/handlers/libpod/manifests.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package libpod
 
 import (
diff --git a/pkg/api/handlers/libpod/networks.go b/pkg/api/handlers/libpod/networks.go
index e427cb94f6..1bbcfa9f5e 100644
--- a/pkg/api/handlers/libpod/networks.go
+++ b/pkg/api/handlers/libpod/networks.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package libpod
 
 import (
diff --git a/pkg/api/handlers/libpod/play.go b/pkg/api/handlers/libpod/play.go
index 74830badbf..0e7625c5ff 100644
--- a/pkg/api/handlers/libpod/play.go
+++ b/pkg/api/handlers/libpod/play.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package libpod
 
 import (
diff --git a/pkg/api/handlers/libpod/pods.go b/pkg/api/handlers/libpod/pods.go
index 1c2ee28505..68c089774e 100644
--- a/pkg/api/handlers/libpod/pods.go
+++ b/pkg/api/handlers/libpod/pods.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package libpod
 
 import (
diff --git a/pkg/api/handlers/libpod/secrets.go b/pkg/api/handlers/libpod/secrets.go
index 56d27778c5..068ebecb76 100644
--- a/pkg/api/handlers/libpod/secrets.go
+++ b/pkg/api/handlers/libpod/secrets.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package libpod
 
 import (
diff --git a/pkg/api/handlers/libpod/swagger_spec.go b/pkg/api/handlers/libpod/swagger_spec.go
index 3ba2cb4d35..bcfb407e38 100644
--- a/pkg/api/handlers/libpod/swagger_spec.go
+++ b/pkg/api/handlers/libpod/swagger_spec.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package libpod
 
 import (
diff --git a/pkg/api/handlers/libpod/system.go b/pkg/api/handlers/libpod/system.go
index c6444fd901..a658d20d90 100644
--- a/pkg/api/handlers/libpod/system.go
+++ b/pkg/api/handlers/libpod/system.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package libpod
 
 import (
diff --git a/pkg/api/handlers/libpod/volumes.go b/pkg/api/handlers/libpod/volumes.go
index b3b3ce27ae..986052e924 100644
--- a/pkg/api/handlers/libpod/volumes.go
+++ b/pkg/api/handlers/libpod/volumes.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package libpod
 
 import (
diff --git a/pkg/api/handlers/swagger/doc.go b/pkg/api/handlers/swagger/doc.go
index 7e535ea298..8b1c557c6c 100644
--- a/pkg/api/handlers/swagger/doc.go
+++ b/pkg/api/handlers/swagger/doc.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 // Package swagger defines the payloads used by the Podman API
 //
 //   - errors.go: declares the errors used in the API. By embedding errors.ErrorModel, more meaningful
diff --git a/pkg/api/handlers/swagger/errors.go b/pkg/api/handlers/swagger/errors.go
index 176fa3c18c..2fac8b36fa 100644
--- a/pkg/api/handlers/swagger/errors.go
+++ b/pkg/api/handlers/swagger/errors.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 //nolint:unused // these types are used to wire generated swagger to API code
 package swagger
 
diff --git a/pkg/api/handlers/swagger/models.go b/pkg/api/handlers/swagger/models.go
index d792c41072..56fd5d8b56 100644
--- a/pkg/api/handlers/swagger/models.go
+++ b/pkg/api/handlers/swagger/models.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 //nolint:unused // these types are used to wire generated swagger to API code
 package swagger
 
diff --git a/pkg/api/handlers/swagger/responses.go b/pkg/api/handlers/swagger/responses.go
index 5c0192f919..f3fe133342 100644
--- a/pkg/api/handlers/swagger/responses.go
+++ b/pkg/api/handlers/swagger/responses.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 //nolint:unused // these types are used to wire generated swagger to API code
 package swagger
 
diff --git a/pkg/api/handlers/utils/apiutil/apiutil.go b/pkg/api/handlers/utils/apiutil/apiutil.go
index 48f4dfba5d..f5fde780b4 100644
--- a/pkg/api/handlers/utils/apiutil/apiutil.go
+++ b/pkg/api/handlers/utils/apiutil/apiutil.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package apiutil
 
 import (
diff --git a/pkg/api/handlers/utils/apiutil/apiutil_test.go b/pkg/api/handlers/utils/apiutil/apiutil_test.go
index 377c0ef84a..02a1194d06 100644
--- a/pkg/api/handlers/utils/apiutil/apiutil_test.go
+++ b/pkg/api/handlers/utils/apiutil/apiutil_test.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package apiutil
 
 import (
diff --git a/pkg/api/handlers/utils/containers.go b/pkg/api/handlers/utils/containers.go
index 383505cabb..62af4b45d1 100644
--- a/pkg/api/handlers/utils/containers.go
+++ b/pkg/api/handlers/utils/containers.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package utils
 
 import (
diff --git a/pkg/api/handlers/utils/errors.go b/pkg/api/handlers/utils/errors.go
index f659aa06cc..82255ac410 100644
--- a/pkg/api/handlers/utils/errors.go
+++ b/pkg/api/handlers/utils/errors.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package utils
 
 import (
diff --git a/pkg/api/handlers/utils/handler.go b/pkg/api/handlers/utils/handler.go
index 49bbf4c0cf..dc425ce656 100644
--- a/pkg/api/handlers/utils/handler.go
+++ b/pkg/api/handlers/utils/handler.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package utils
 
 import (
diff --git a/pkg/api/handlers/utils/handler_test.go b/pkg/api/handlers/utils/handler_test.go
index 099f4169b9..4df0f08042 100644
--- a/pkg/api/handlers/utils/handler_test.go
+++ b/pkg/api/handlers/utils/handler_test.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package utils
 
 import (
diff --git a/pkg/api/handlers/utils/images.go b/pkg/api/handlers/utils/images.go
index c330e45e55..f97f493972 100644
--- a/pkg/api/handlers/utils/images.go
+++ b/pkg/api/handlers/utils/images.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package utils
 
 import (
diff --git a/pkg/api/server/doc.go b/pkg/api/server/doc.go
index b7f31fffa9..63a9bc0a3a 100644
--- a/pkg/api/server/doc.go
+++ b/pkg/api/server/doc.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 // Package server supports a RESTful API for the Libpod library
 //
 // This documentation describes the Podman v2.x+ RESTful API. It consists of a Docker-compatible
diff --git a/pkg/api/server/handler_api.go b/pkg/api/server/handler_api.go
index 7696db4eec..9a895f0814 100644
--- a/pkg/api/server/handler_api.go
+++ b/pkg/api/server/handler_api.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package server
 
 import (
diff --git a/pkg/api/server/handler_logging.go b/pkg/api/server/handler_logging.go
index 2f62a28fd3..1fd75e233f 100644
--- a/pkg/api/server/handler_logging.go
+++ b/pkg/api/server/handler_logging.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package server
 
 import (
diff --git a/pkg/api/server/handler_panic.go b/pkg/api/server/handler_panic.go
index 5bab6eff83..e654c0047a 100644
--- a/pkg/api/server/handler_panic.go
+++ b/pkg/api/server/handler_panic.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package server
 
 import (
diff --git a/pkg/api/server/handler_rid.go b/pkg/api/server/handler_rid.go
index 7869cc1a14..1acd47823b 100644
--- a/pkg/api/server/handler_rid.go
+++ b/pkg/api/server/handler_rid.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package server
 
 import (
diff --git a/pkg/api/server/idle/tracker.go b/pkg/api/server/idle/tracker.go
index fe815f6138..c192d13e11 100644
--- a/pkg/api/server/idle/tracker.go
+++ b/pkg/api/server/idle/tracker.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package idle
 
 import (
diff --git a/pkg/api/server/listener_api.go b/pkg/api/server/listener_api.go
index 38abe27431..a657396922 100644
--- a/pkg/api/server/listener_api.go
+++ b/pkg/api/server/listener_api.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package server
 
 import (
diff --git a/pkg/api/server/register_archive.go b/pkg/api/server/register_archive.go
index 6e031a074e..b21983a241 100644
--- a/pkg/api/server/register_archive.go
+++ b/pkg/api/server/register_archive.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package server
 
 import (
diff --git a/pkg/api/server/register_auth.go b/pkg/api/server/register_auth.go
index 6fabd65fe0..d199f4cfae 100644
--- a/pkg/api/server/register_auth.go
+++ b/pkg/api/server/register_auth.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package server
 
 import (
diff --git a/pkg/api/server/register_containers.go b/pkg/api/server/register_containers.go
index b3a603af95..cc1cc5e74d 100644
--- a/pkg/api/server/register_containers.go
+++ b/pkg/api/server/register_containers.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package server
 
 import (
diff --git a/pkg/api/server/register_distribution.go b/pkg/api/server/register_distribution.go
index d85480d090..90607bb99f 100644
--- a/pkg/api/server/register_distribution.go
+++ b/pkg/api/server/register_distribution.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package server
 
 import (
diff --git a/pkg/api/server/register_events.go b/pkg/api/server/register_events.go
index aa8b3d0d9a..5f8090fc8b 100644
--- a/pkg/api/server/register_events.go
+++ b/pkg/api/server/register_events.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package server
 
 import (
diff --git a/pkg/api/server/register_exec.go b/pkg/api/server/register_exec.go
index 56228ae1aa..f1eaaeaf01 100644
--- a/pkg/api/server/register_exec.go
+++ b/pkg/api/server/register_exec.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package server
 
 import (
diff --git a/pkg/api/server/register_generate.go b/pkg/api/server/register_generate.go
index 2d1d517cf8..c5299a5754 100644
--- a/pkg/api/server/register_generate.go
+++ b/pkg/api/server/register_generate.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package server
 
 import (
diff --git a/pkg/api/server/register_healthcheck.go b/pkg/api/server/register_healthcheck.go
index b3643af6df..1535f984ce 100644
--- a/pkg/api/server/register_healthcheck.go
+++ b/pkg/api/server/register_healthcheck.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package server
 
 import (
diff --git a/pkg/api/server/register_images.go b/pkg/api/server/register_images.go
index 68ab63cc1d..fa01634b5c 100644
--- a/pkg/api/server/register_images.go
+++ b/pkg/api/server/register_images.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package server
 
 import (
diff --git a/pkg/api/server/register_info.go b/pkg/api/server/register_info.go
index 5f6a114326..6252ac57c2 100644
--- a/pkg/api/server/register_info.go
+++ b/pkg/api/server/register_info.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package server
 
 import (
diff --git a/pkg/api/server/register_kube.go b/pkg/api/server/register_kube.go
index 5678746669..b50bafecab 100644
--- a/pkg/api/server/register_kube.go
+++ b/pkg/api/server/register_kube.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package server
 
 import (
diff --git a/pkg/api/server/register_manifest.go b/pkg/api/server/register_manifest.go
index a7bd4efc11..a6de54d0b6 100644
--- a/pkg/api/server/register_manifest.go
+++ b/pkg/api/server/register_manifest.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package server
 
 import (
diff --git a/pkg/api/server/register_monitor.go b/pkg/api/server/register_monitor.go
index b892442bd2..7bcfafa813 100644
--- a/pkg/api/server/register_monitor.go
+++ b/pkg/api/server/register_monitor.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package server
 
 import (
diff --git a/pkg/api/server/register_networks.go b/pkg/api/server/register_networks.go
index 38075e93b5..c324b4c73b 100644
--- a/pkg/api/server/register_networks.go
+++ b/pkg/api/server/register_networks.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package server
 
 import (
diff --git a/pkg/api/server/register_ping.go b/pkg/api/server/register_ping.go
index 041fbf301a..ee0098e9af 100644
--- a/pkg/api/server/register_ping.go
+++ b/pkg/api/server/register_ping.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package server
 
 import (
diff --git a/pkg/api/server/register_plugins.go b/pkg/api/server/register_plugins.go
index 2e4aca8d4a..8ea03d7376 100644
--- a/pkg/api/server/register_plugins.go
+++ b/pkg/api/server/register_plugins.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package server
 
 import (
diff --git a/pkg/api/server/register_pods.go b/pkg/api/server/register_pods.go
index 0eb7e79a80..842e1588fc 100644
--- a/pkg/api/server/register_pods.go
+++ b/pkg/api/server/register_pods.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package server
 
 import (
diff --git a/pkg/api/server/register_secrets.go b/pkg/api/server/register_secrets.go
index deb0fc2492..0540abf356 100644
--- a/pkg/api/server/register_secrets.go
+++ b/pkg/api/server/register_secrets.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package server
 
 import (
diff --git a/pkg/api/server/register_swagger.go b/pkg/api/server/register_swagger.go
index ceb9d87426..db5c6709e4 100644
--- a/pkg/api/server/register_swagger.go
+++ b/pkg/api/server/register_swagger.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package server
 
 import (
diff --git a/pkg/api/server/register_swarm.go b/pkg/api/server/register_swarm.go
index 4dcb63cf32..af819ebb34 100644
--- a/pkg/api/server/register_swarm.go
+++ b/pkg/api/server/register_swarm.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package server
 
 import (
diff --git a/pkg/api/server/register_system.go b/pkg/api/server/register_system.go
index 4010dfb0e0..91d31a86d3 100644
--- a/pkg/api/server/register_system.go
+++ b/pkg/api/server/register_system.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package server
 
 import (
diff --git a/pkg/api/server/register_version.go b/pkg/api/server/register_version.go
index 1a62e51d83..1d1ca0eef0 100644
--- a/pkg/api/server/register_version.go
+++ b/pkg/api/server/register_version.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package server
 
 import (
diff --git a/pkg/api/server/register_volumes.go b/pkg/api/server/register_volumes.go
index 7ad71e58cb..867325d24e 100644
--- a/pkg/api/server/register_volumes.go
+++ b/pkg/api/server/register_volumes.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package server
 
 import (
diff --git a/pkg/api/server/server.go b/pkg/api/server/server.go
index 8c5b73872a..4c07390d0d 100644
--- a/pkg/api/server/server.go
+++ b/pkg/api/server/server.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package server
 
 import (
diff --git a/pkg/api/types/types.go b/pkg/api/types/types.go
index a01ded0111..eb4d89e0f2 100644
--- a/pkg/api/types/types.go
+++ b/pkg/api/types/types.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package types
 
 type APIContextKey int
diff --git a/pkg/domain/infra/abi/apply.go b/pkg/domain/infra/abi/apply.go
index 9031546365..2c3986b4e1 100644
--- a/pkg/domain/infra/abi/apply.go
+++ b/pkg/domain/infra/abi/apply.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package abi
 
 import (
diff --git a/pkg/domain/infra/abi/archive.go b/pkg/domain/infra/abi/archive.go
index 49dc9f3f04..711d54f93d 100644
--- a/pkg/domain/infra/abi/archive.go
+++ b/pkg/domain/infra/abi/archive.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package abi
 
 import (
diff --git a/pkg/domain/infra/abi/auto-update.go b/pkg/domain/infra/abi/auto-update.go
index 57504e92a1..f8f14169da 100644
--- a/pkg/domain/infra/abi/auto-update.go
+++ b/pkg/domain/infra/abi/auto-update.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package abi
 
 import (
diff --git a/pkg/domain/infra/abi/config.go b/pkg/domain/infra/abi/config.go
index ae564cf442..bc41498a8e 100644
--- a/pkg/domain/infra/abi/config.go
+++ b/pkg/domain/infra/abi/config.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package abi
 
 import (
diff --git a/pkg/domain/infra/abi/config_test.go b/pkg/domain/infra/abi/config_test.go
index 4a9af42e43..6ac29276ca 100644
--- a/pkg/domain/infra/abi/config_test.go
+++ b/pkg/domain/infra/abi/config_test.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package abi
 
 import (
diff --git a/pkg/domain/infra/abi/containers.go b/pkg/domain/infra/abi/containers.go
index 091d493a84..47389e9fdc 100644
--- a/pkg/domain/infra/abi/containers.go
+++ b/pkg/domain/infra/abi/containers.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package abi
 
 import (
@@ -18,7 +20,6 @@ import (
 	"github.com/containers/podman/v5/libpod"
 	"github.com/containers/podman/v5/libpod/define"
 	"github.com/containers/podman/v5/libpod/logs"
-	"github.com/containers/podman/v5/pkg/api/handlers"
 	"github.com/containers/podman/v5/pkg/checkpoint"
 	"github.com/containers/podman/v5/pkg/domain/entities"
 	"github.com/containers/podman/v5/pkg/domain/entities/reports"
@@ -586,7 +587,7 @@ func (ic *ContainerEngine) ContainerCommit(ctx context.Context, nameOrID string,
 	sc := ic.Libpod.SystemContext()
 	var changes []string
 	if len(options.Changes) > 0 {
-		changes = handlers.DecodeChanges(options.Changes)
+		changes = util.DecodeChanges(options.Changes)
 	}
 	var overrideConfig *manifest.Schema2Config
 	if len(options.Config) > 0 {
diff --git a/pkg/domain/infra/abi/containers_freebsd.go b/pkg/domain/infra/abi/containers_freebsd.go
index a095a87cb7..cb47418399 100644
--- a/pkg/domain/infra/abi/containers_freebsd.go
+++ b/pkg/domain/infra/abi/containers_freebsd.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package abi
 
 const processFileDescriptorsPath = "/dev/fd"
diff --git a/pkg/domain/infra/abi/containers_linux.go b/pkg/domain/infra/abi/containers_linux.go
index 10b3d33a49..927aaa611e 100644
--- a/pkg/domain/infra/abi/containers_linux.go
+++ b/pkg/domain/infra/abi/containers_linux.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package abi
 
 const processFileDescriptorsPath = "/proc/self/fd"
diff --git a/pkg/domain/infra/abi/containers_runlabel.go b/pkg/domain/infra/abi/containers_runlabel.go
index 2a4119996f..d27ea0ec7d 100644
--- a/pkg/domain/infra/abi/containers_runlabel.go
+++ b/pkg/domain/infra/abi/containers_runlabel.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package abi
 
 import (
diff --git a/pkg/domain/infra/abi/containers_runlabel_test.go b/pkg/domain/infra/abi/containers_runlabel_test.go
index 10f9ae0040..3b12b54f7d 100644
--- a/pkg/domain/infra/abi/containers_runlabel_test.go
+++ b/pkg/domain/infra/abi/containers_runlabel_test.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package abi
 
 import (
diff --git a/pkg/domain/infra/abi/containers_stat.go b/pkg/domain/infra/abi/containers_stat.go
index 99cde00350..aed498fe01 100644
--- a/pkg/domain/infra/abi/containers_stat.go
+++ b/pkg/domain/infra/abi/containers_stat.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package abi
 
 import (
diff --git a/pkg/domain/infra/abi/events.go b/pkg/domain/infra/abi/events.go
index ffbd119f1c..ad2bf5313f 100644
--- a/pkg/domain/infra/abi/events.go
+++ b/pkg/domain/infra/abi/events.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package abi
 
 import (
diff --git a/pkg/domain/infra/abi/generate.go b/pkg/domain/infra/abi/generate.go
index e424500fbd..d58fb03238 100644
--- a/pkg/domain/infra/abi/generate.go
+++ b/pkg/domain/infra/abi/generate.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package abi
 
 import (
diff --git a/pkg/domain/infra/abi/healthcheck.go b/pkg/domain/infra/abi/healthcheck.go
index b464c88c4b..6c61dfa4fe 100644
--- a/pkg/domain/infra/abi/healthcheck.go
+++ b/pkg/domain/infra/abi/healthcheck.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package abi
 
 import (
diff --git a/pkg/domain/infra/abi/images.go b/pkg/domain/infra/abi/images.go
index f61b54c227..dceea76445 100644
--- a/pkg/domain/infra/abi/images.go
+++ b/pkg/domain/infra/abi/images.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package abi
 
 import (
diff --git a/pkg/domain/infra/abi/images_list.go b/pkg/domain/infra/abi/images_list.go
index 6f6d575711..9fa855035a 100644
--- a/pkg/domain/infra/abi/images_list.go
+++ b/pkg/domain/infra/abi/images_list.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package abi
 
 import (
diff --git a/pkg/domain/infra/abi/images_test.go b/pkg/domain/infra/abi/images_test.go
index 3999de4578..f24a11cd0e 100644
--- a/pkg/domain/infra/abi/images_test.go
+++ b/pkg/domain/infra/abi/images_test.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package abi
 
 import (
diff --git a/pkg/domain/infra/abi/internal/expansion/expand.go b/pkg/domain/infra/abi/internal/expansion/expand.go
index 6bf0ea8ce0..293679380a 100644
--- a/pkg/domain/infra/abi/internal/expansion/expand.go
+++ b/pkg/domain/infra/abi/internal/expansion/expand.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package expansion
 
 import (
diff --git a/pkg/domain/infra/abi/internal/expansion/expand_test.go b/pkg/domain/infra/abi/internal/expansion/expand_test.go
index 45f32edfc6..e432ceee66 100644
--- a/pkg/domain/infra/abi/internal/expansion/expand_test.go
+++ b/pkg/domain/infra/abi/internal/expansion/expand_test.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package expansion
 
 import (
diff --git a/pkg/domain/infra/abi/manifest.go b/pkg/domain/infra/abi/manifest.go
index d7f1054b19..253e173474 100644
--- a/pkg/domain/infra/abi/manifest.go
+++ b/pkg/domain/infra/abi/manifest.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package abi
 
 import (
diff --git a/pkg/domain/infra/abi/network.go b/pkg/domain/infra/abi/network.go
index c39b9c600b..5dc3963ba1 100644
--- a/pkg/domain/infra/abi/network.go
+++ b/pkg/domain/infra/abi/network.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package abi
 
 import (
diff --git a/pkg/domain/infra/abi/parse/parse.go b/pkg/domain/infra/abi/parse/parse.go
index 571e52a951..268610716c 100644
--- a/pkg/domain/infra/abi/parse/parse.go
+++ b/pkg/domain/infra/abi/parse/parse.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package parse
 
 import (
diff --git a/pkg/domain/infra/abi/play.go b/pkg/domain/infra/abi/play.go
index 6374f212ba..3fb5b5b6d9 100644
--- a/pkg/domain/infra/abi/play.go
+++ b/pkg/domain/infra/abi/play.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package abi
 
 import (
diff --git a/pkg/domain/infra/abi/play_test.go b/pkg/domain/infra/abi/play_test.go
index 4661763e28..ef6207f127 100644
--- a/pkg/domain/infra/abi/play_test.go
+++ b/pkg/domain/infra/abi/play_test.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package abi
 
 import (
diff --git a/pkg/domain/infra/abi/play_utils.go b/pkg/domain/infra/abi/play_utils.go
index 16d30acd16..7285d9c9b9 100644
--- a/pkg/domain/infra/abi/play_utils.go
+++ b/pkg/domain/infra/abi/play_utils.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package abi
 
 import "github.com/containers/podman/v5/libpod/define"
diff --git a/pkg/domain/infra/abi/play_utils_test.go b/pkg/domain/infra/abi/play_utils_test.go
index 8bc56e234b..fa4b6010c0 100644
--- a/pkg/domain/infra/abi/play_utils_test.go
+++ b/pkg/domain/infra/abi/play_utils_test.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package abi
 
 import (
diff --git a/pkg/domain/infra/abi/pods.go b/pkg/domain/infra/abi/pods.go
index 8d44532023..d402421cc8 100644
--- a/pkg/domain/infra/abi/pods.go
+++ b/pkg/domain/infra/abi/pods.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package abi
 
 import (
diff --git a/pkg/domain/infra/abi/pods_stats.go b/pkg/domain/infra/abi/pods_stats.go
index 26d070344e..3b76407f7d 100644
--- a/pkg/domain/infra/abi/pods_stats.go
+++ b/pkg/domain/infra/abi/pods_stats.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package abi
 
 import (
diff --git a/pkg/domain/infra/abi/runtime.go b/pkg/domain/infra/abi/runtime.go
index bfa182f243..6e5f3240ef 100644
--- a/pkg/domain/infra/abi/runtime.go
+++ b/pkg/domain/infra/abi/runtime.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package abi
 
 import (
diff --git a/pkg/domain/infra/abi/secrets.go b/pkg/domain/infra/abi/secrets.go
index 02fbc94269..5f5cfdc19b 100644
--- a/pkg/domain/infra/abi/secrets.go
+++ b/pkg/domain/infra/abi/secrets.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package abi
 
 import (
diff --git a/pkg/domain/infra/abi/secrets_test.go b/pkg/domain/infra/abi/secrets_test.go
index 6b3a745e25..fb6157d9c5 100644
--- a/pkg/domain/infra/abi/secrets_test.go
+++ b/pkg/domain/infra/abi/secrets_test.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package abi
 
 import (
diff --git a/pkg/domain/infra/abi/system.go b/pkg/domain/infra/abi/system.go
index 5da8aba326..440d81e48b 100644
--- a/pkg/domain/infra/abi/system.go
+++ b/pkg/domain/infra/abi/system.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package abi
 
 import (
diff --git a/pkg/domain/infra/abi/system_freebsd.go b/pkg/domain/infra/abi/system_freebsd.go
index 1521a7e1a8..9f17df7828 100644
--- a/pkg/domain/infra/abi/system_freebsd.go
+++ b/pkg/domain/infra/abi/system_freebsd.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package abi
 
 import (
diff --git a/pkg/domain/infra/abi/system_linux.go b/pkg/domain/infra/abi/system_linux.go
index 6dd99554cd..50e4632408 100644
--- a/pkg/domain/infra/abi/system_linux.go
+++ b/pkg/domain/infra/abi/system_linux.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package abi
 
 import (
diff --git a/pkg/domain/infra/abi/terminal/sigproxy_commn.go b/pkg/domain/infra/abi/terminal/sigproxy_commn.go
index e4a601f93d..df9aee00ad 100644
--- a/pkg/domain/infra/abi/terminal/sigproxy_commn.go
+++ b/pkg/domain/infra/abi/terminal/sigproxy_commn.go
@@ -1,4 +1,4 @@
-//go:build linux || freebsd
+//go:build (linux || freebsd) && !remote
 
 package terminal
 
diff --git a/pkg/domain/infra/abi/terminal/terminal.go b/pkg/domain/infra/abi/terminal/terminal.go
index c7b75c6c29..954997c095 100644
--- a/pkg/domain/infra/abi/terminal/terminal.go
+++ b/pkg/domain/infra/abi/terminal/terminal.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package terminal
 
 import (
diff --git a/pkg/domain/infra/abi/terminal/terminal_common.go b/pkg/domain/infra/abi/terminal/terminal_common.go
index 5ca0d8d2c4..065ac3012d 100644
--- a/pkg/domain/infra/abi/terminal/terminal_common.go
+++ b/pkg/domain/infra/abi/terminal/terminal_common.go
@@ -1,4 +1,4 @@
-//go:build linux || freebsd
+//go:build (linux || freebsd) && !remote
 
 package terminal
 
diff --git a/pkg/domain/infra/abi/terminal/terminal_unsupported.go b/pkg/domain/infra/abi/terminal/terminal_unsupported.go
index a1b5ac37d1..b67c738751 100644
--- a/pkg/domain/infra/abi/terminal/terminal_unsupported.go
+++ b/pkg/domain/infra/abi/terminal/terminal_unsupported.go
@@ -1,4 +1,4 @@
-//go:build !linux && !freebsd
+//go:build !linux && !freebsd && !remote
 
 package terminal
 
diff --git a/pkg/domain/infra/abi/trust.go b/pkg/domain/infra/abi/trust.go
index e23ed4bd57..5b617b1154 100644
--- a/pkg/domain/infra/abi/trust.go
+++ b/pkg/domain/infra/abi/trust.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package abi
 
 import (
diff --git a/pkg/domain/infra/abi/volumes.go b/pkg/domain/infra/abi/volumes.go
index d99ab0f992..7ecc29324f 100644
--- a/pkg/domain/infra/abi/volumes.go
+++ b/pkg/domain/infra/abi/volumes.go
@@ -1,3 +1,5 @@
+//go:build !remote
+
 package abi
 
 import (
diff --git a/pkg/domain/infra/tunnel/containers.go b/pkg/domain/infra/tunnel/containers.go
index 9c81fb2197..6e8c6fea44 100644
--- a/pkg/domain/infra/tunnel/containers.go
+++ b/pkg/domain/infra/tunnel/containers.go
@@ -350,7 +350,7 @@ func (ic *ContainerEngine) ContainerCommit(ctx context.Context, nameOrID string,
 	}
 	var changes []string
 	if len(opts.Changes) > 0 {
-		changes = handlers.DecodeChanges(opts.Changes)
+		changes = util.DecodeChanges(opts.Changes)
 	}
 	var configReader io.Reader
 	if len(opts.Config) > 0 {
diff --git a/pkg/api/handlers/changes.go b/pkg/util/changes.go
similarity index 98%
rename from pkg/api/handlers/changes.go
rename to pkg/util/changes.go
index 58e3a739ad..86f418c335 100644
--- a/pkg/api/handlers/changes.go
+++ b/pkg/util/changes.go
@@ -1,4 +1,4 @@
-package handlers
+package util
 
 import (
 	"strings"
diff --git a/pkg/api/handlers/changes_test.go b/pkg/util/changes_test.go
similarity index 98%
rename from pkg/api/handlers/changes_test.go
rename to pkg/util/changes_test.go
index 03ff1523e7..2b635c5d64 100644
--- a/pkg/api/handlers/changes_test.go
+++ b/pkg/util/changes_test.go
@@ -1,4 +1,4 @@
-package handlers
+package util
 
 import (
 	"testing"