diff --git a/.golangci.yml b/.golangci.yml
index 95f5fd22ee..8a06cb9aa8 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -58,7 +58,6 @@ linters-settings:
   errcheck:
     check-blank: false
   nolintlint:
-    allow-unused: true
     require-specific: true
   revive:
     rules:
diff --git a/cmd/podman/containers/stats.go b/cmd/podman/containers/stats.go
index ef2b7a754a..17fa6ce54e 100644
--- a/cmd/podman/containers/stats.go
+++ b/cmd/podman/containers/stats.go
@@ -252,10 +252,10 @@ func combineBytesValues(a, b uint64) string {
 
 func outputJSON(stats []containerStats) error {
 	type jstat struct {
-		Id         string `json:"id"` //nolint:revive
+		Id         string `json:"id"`
 		Name       string `json:"name"`
 		CPUTime    string `json:"cpu_time"`
-		CpuPercent string `json:"cpu_percent"` //nolint:revive
+		CpuPercent string `json:"cpu_percent"`
 		AverageCPU string `json:"avg_cpu"`
 		MemUsage   string `json:"mem_usage"`
 		MemPerc    string `json:"mem_percent"`
diff --git a/cmd/podman/pods/ps.go b/cmd/podman/pods/ps.go
index 123bc75a41..c5771a7969 100644
--- a/cmd/podman/pods/ps.go
+++ b/cmd/podman/pods/ps.go
@@ -221,7 +221,7 @@ func (l ListPodReporter) ID() string {
 }
 
 // Id returns the Pod id
-func (l ListPodReporter) Id() string { //nolint:revive
+func (l ListPodReporter) Id() string {
 	if noTrunc {
 		return l.ListPodsReport.Id
 	}
@@ -235,7 +235,7 @@ func (l ListPodReporter) InfraID() string {
 
 // InfraId returns the infra container id for the pod
 // depending on trunc
-func (l ListPodReporter) InfraId() string { //nolint:revive
+func (l ListPodReporter) InfraId() string {
 	if len(l.ListPodsReport.InfraId) == 0 {
 		return ""
 	}
diff --git a/cmd/podman/system/migrate.go b/cmd/podman/system/migrate.go
index 7405cb101a..8dbdb0b3d6 100644
--- a/cmd/podman/system/migrate.go
+++ b/cmd/podman/system/migrate.go
@@ -58,7 +58,6 @@ func migrate(cmd *cobra.Command, args []string) {
 
 		// FIXME change this to return the error like other commands
 		// defer will never run on os.Exit()
-		//nolint:gocritic
 		os.Exit(define.ExecErrorCodeGeneric)
 	}
 	os.Exit(0)
diff --git a/cmd/podman/system/renumber.go b/cmd/podman/system/renumber.go
index a09ee70a3a..bd425c1f43 100644
--- a/cmd/podman/system/renumber.go
+++ b/cmd/podman/system/renumber.go
@@ -38,12 +38,12 @@ func init() {
 		Parent:  systemCmd,
 	})
 }
+
 func renumber(cmd *cobra.Command, args []string) {
 	if err := registry.ContainerEngine().Renumber(registry.Context()); err != nil {
 		fmt.Println(err)
 		// FIXME change this to return the error like other commands
 		// defer will never run on os.Exit()
-		//nolint:gocritic
 		os.Exit(define.ExecErrorCodeGeneric)
 	}
 	os.Exit(0)
diff --git a/cmd/rootlessport/wsl_test.go b/cmd/rootlessport/wsl_test.go
index f7730234c4..be3eb3d97f 100644
--- a/cmd/rootlessport/wsl_test.go
+++ b/cmd/rootlessport/wsl_test.go
@@ -20,7 +20,6 @@ type SpecData struct {
 }
 
 func TestDualStackSplit(t *testing.T) {
-	//nolint:revive
 	const (
 		IP4_ALL = "0.0.0.0"
 		IP4__LO = "127.0.0.1"
diff --git a/libpod/container_exec.go b/libpod/container_exec.go
index d57a2c044f..aec429b0eb 100644
--- a/libpod/container_exec.go
+++ b/libpod/container_exec.go
@@ -86,10 +86,10 @@ type ExecConfig struct {
 type ExecSession struct {
 	// Id is the ID of the exec session.
 	// Named somewhat strangely to not conflict with ID().
-	Id string `json:"id"` //nolint:revive
+	Id string `json:"id"`
 	// ContainerId is the ID of the container this exec session belongs to.
 	// Named somewhat strangely to not conflict with ContainerID().
-	ContainerId string `json:"containerId"` //nolint:revive
+	ContainerId string `json:"containerId"`
 
 	// State is the state of the exec session.
 	State define.ContainerExecStatus `json:"state"`
diff --git a/libpod/define/container_inspect.go b/libpod/define/container_inspect.go
index fa9b1320a5..bd3492d3d4 100644
--- a/libpod/define/container_inspect.go
+++ b/libpod/define/container_inspect.go
@@ -356,8 +356,6 @@ type HealthCheckLog struct {
 // as possible from the spec and container config.
 // Some things cannot be inferred. These will be populated by spec annotations
 // (if available).
-//
-//nolint:revive // Field names are fixed for compatibility and cannot be changed.
 type InspectContainerHostConfig struct {
 	// Binds contains an array of user-added mounts.
 	// Both volume mounts and named volumes are included.
diff --git a/libpod/lock/file/file_lock.go b/libpod/lock/file/file_lock.go
index 67dd35a3a4..58e4f560ad 100644
--- a/libpod/lock/file/file_lock.go
+++ b/libpod/lock/file/file_lock.go
@@ -16,7 +16,7 @@ import (
 
 // FileLocks is a struct enabling POSIX lock locking in a shared memory
 // segment.
-type FileLocks struct { //nolint:revive // struct name stutters
+type FileLocks struct {
 	lockPath string
 	valid    bool
 }
diff --git a/libpod/lock/shm/shm_lock.go b/libpod/lock/shm/shm_lock.go
index 24031a8cab..7aff2788a9 100644
--- a/libpod/lock/shm/shm_lock.go
+++ b/libpod/lock/shm/shm_lock.go
@@ -31,7 +31,7 @@ var (
 
 // SHMLocks is a struct enabling POSIX semaphore locking in a shared memory
 // segment.
-type SHMLocks struct { //nolint:revive // linter complains about stutter
+type SHMLocks struct {
 	lockStruct *C.shm_struct_t
 	maxLocks   uint32
 	valid      bool
diff --git a/pkg/api/handlers/compat/images.go b/pkg/api/handlers/compat/images.go
index efa55094c0..2462936728 100644
--- a/pkg/api/handlers/compat/images.go
+++ b/pkg/api/handlers/compat/images.go
@@ -243,7 +243,7 @@ func CreateImageFromSrc(w http.ResponseWriter, r *http.Request) {
 		Status         string            `json:"status"`
 		Progress       string            `json:"progress"`
 		ProgressDetail map[string]string `json:"progressDetail"`
-		Id             string            `json:"id"` //nolint:revive
+		Id             string            `json:"id"`
 	}{
 		Status:         report.Id,
 		ProgressDetail: map[string]string{},
diff --git a/pkg/api/handlers/compat/images_build.go b/pkg/api/handlers/compat/images_build.go
index a09523aa86..7c0b7d09ed 100644
--- a/pkg/api/handlers/compat/images_build.go
+++ b/pkg/api/handlers/compat/images_build.go
@@ -110,11 +110,11 @@ func BuildImage(w http.ResponseWriter, r *http.Request) {
 		Compression             uint64   `schema:"compression"`
 		ConfigureNetwork        string   `schema:"networkmode"`
 		CPPFlags                string   `schema:"cppflags"`
-		CpuPeriod               uint64   `schema:"cpuperiod"`  //nolint:revive
-		CpuQuota                int64    `schema:"cpuquota"`   //nolint:revive
-		CpuSetCpus              string   `schema:"cpusetcpus"` //nolint:revive
-		CpuSetMems              string   `schema:"cpusetmems"` //nolint:revive
-		CpuShares               uint64   `schema:"cpushares"`  //nolint:revive
+		CpuPeriod               uint64   `schema:"cpuperiod"`
+		CpuQuota                int64    `schema:"cpuquota"`
+		CpuSetCpus              string   `schema:"cpusetcpus"`
+		CpuSetMems              string   `schema:"cpusetmems"`
+		CpuShares               uint64   `schema:"cpushares"`
 		DNSOptions              string   `schema:"dnsoptions"`
 		DNSSearch               string   `schema:"dnssearch"`
 		DNSServers              string   `schema:"dnsservers"`
diff --git a/pkg/bindings/connection.go b/pkg/bindings/connection.go
index c3008b75d3..db69072f2a 100644
--- a/pkg/bindings/connection.go
+++ b/pkg/bindings/connection.go
@@ -443,25 +443,21 @@ func (c *Connection) GetDialer(ctx context.Context) (net.Conn, error) {
 
 // IsInformational returns true if the response code is 1xx
 func (h *APIResponse) IsInformational() bool {
-	//nolint:usestdlibvars // linter wants to use http.StatusContinue over 100 but that makes less readable IMO
 	return h.Response.StatusCode/100 == 1
 }
 
 // IsSuccess returns true if the response code is 2xx
 func (h *APIResponse) IsSuccess() bool {
-	//nolint:usestdlibvars // linter wants to use http.StatusContinue over 100 but that makes less readable IMO
 	return h.Response.StatusCode/100 == 2
 }
 
 // IsRedirection returns true if the response code is 3xx
 func (h *APIResponse) IsRedirection() bool {
-	//nolint:usestdlibvars // linter wants to use http.StatusContinue over 100 but that makes less readable IMO
 	return h.Response.StatusCode/100 == 3
 }
 
 // IsClientError returns true if the response code is 4xx
 func (h *APIResponse) IsClientError() bool {
-	//nolint:usestdlibvars // linter wants to use http.StatusContinue over 100 but that makes less readable IMO
 	return h.Response.StatusCode/100 == 4
 }
 
@@ -472,6 +468,5 @@ func (h *APIResponse) IsConflictError() bool {
 
 // IsServerError returns true if the response code is 5xx
 func (h *APIResponse) IsServerError() bool {
-	//nolint:usestdlibvars // linter wants to use http.StatusContinue over 100 but that makes less readable IMO
 	return h.Response.StatusCode/100 == 5
 }
diff --git a/pkg/bindings/test/common_test.go b/pkg/bindings/test/common_test.go
index 6ce6d9d52a..e0e7cedc6c 100644
--- a/pkg/bindings/test/common_test.go
+++ b/pkg/bindings/test/common_test.go
@@ -50,7 +50,7 @@ var (
 		shortName:   "busybox",
 		tarballName: "busybox.tar",
 	}
-	CACHE_IMAGES = []testImage{alpine, busybox} //nolint:revive
+	CACHE_IMAGES = []testImage{alpine, busybox}
 )
 
 type bindingTest struct {
diff --git a/pkg/domain/entities/containers.go b/pkg/domain/entities/containers.go
index 7839388f51..37dfee74be 100644
--- a/pkg/domain/entities/containers.go
+++ b/pkg/domain/entities/containers.go
@@ -89,7 +89,7 @@ type PauseUnPauseOptions struct {
 
 type PauseUnpauseReport struct {
 	Err      error
-	Id       string //nolint:revive
+	Id       string
 	RawInput string
 }
 
@@ -103,7 +103,7 @@ type StopOptions struct {
 
 type StopReport struct {
 	Err      error
-	Id       string //nolint:revive
+	Id       string
 	RawInput string
 }
 
@@ -125,7 +125,7 @@ type KillOptions struct {
 
 type KillReport struct {
 	Err      error
-	Id       string //nolint:revive
+	Id       string
 	RawInput string
 }
 
@@ -139,7 +139,7 @@ type RestartOptions struct {
 
 type RestartReport struct {
 	Err      error
-	Id       string //nolint:revive
+	Id       string
 	RawInput string
 }
 
@@ -187,7 +187,7 @@ type CopyOptions struct {
 }
 
 type CommitReport struct {
-	Id string //nolint:revive
+	Id string
 }
 
 type ContainerExportOptions struct {
@@ -235,7 +235,7 @@ type RestoreOptions struct {
 type RestoreReport = types.RestoreReport
 
 type ContainerCreateReport struct {
-	Id string //nolint:revive
+	Id string
 }
 
 // AttachOptions describes the cli and other values
@@ -315,7 +315,7 @@ type ContainerStartOptions struct {
 // ContainerStartReport describes the response from starting
 // containers from the cli
 type ContainerStartReport struct {
-	Id       string //nolint:revive
+	Id       string
 	RawInput string
 	Err      error
 	ExitCode int
@@ -360,7 +360,7 @@ type ContainerRunOptions struct {
 // a container
 type ContainerRunReport struct {
 	ExitCode int
-	Id       string //nolint:revive
+	Id       string
 }
 
 // ContainerCleanupOptions are the CLI values for the
@@ -378,7 +378,7 @@ type ContainerCleanupOptions struct {
 // container cleanup
 type ContainerCleanupReport struct {
 	CleanErr error
-	Id       string //nolint:revive
+	Id       string
 	RawInput string
 	RmErr    error
 	RmiErr   error
@@ -395,7 +395,7 @@ type ContainerInitOptions struct {
 // container init
 type ContainerInitReport struct {
 	Err      error
-	Id       string //nolint:revive
+	Id       string
 	RawInput string
 }
 
@@ -418,7 +418,7 @@ type ContainerUnmountOptions struct {
 // ContainerMountReport describes the response from container mount
 type ContainerMountReport struct {
 	Err  error
-	Id   string //nolint:revive
+	Id   string
 	Name string
 	Path string
 }
@@ -426,7 +426,7 @@ type ContainerMountReport struct {
 // ContainerUnmountReport describes the response from umounting a container
 type ContainerUnmountReport struct {
 	Err error
-	Id  string //nolint:revive
+	Id  string
 }
 
 // ContainerPruneOptions describes the options needed
@@ -445,7 +445,7 @@ type ContainerPortOptions struct {
 // ContainerPortReport describes the output needed for
 // the CLI to output ports
 type ContainerPortReport struct {
-	Id    string //nolint:revive
+	Id    string
 	Ports []nettypes.PortMapping
 }
 
diff --git a/pkg/domain/entities/images.go b/pkg/domain/entities/images.go
index c3f6aba8ae..b9100af8ff 100644
--- a/pkg/domain/entities/images.go
+++ b/pkg/domain/entities/images.go
@@ -47,7 +47,7 @@ type Image struct {
 	HealthCheck   *manifest.Schema2HealthConfig `json:",omitempty"`
 }
 
-func (i *Image) Id() string { //nolint:revive
+func (i *Image) Id() string {
 	return i.ID
 }
 
diff --git a/pkg/domain/entities/reports/containers.go b/pkg/domain/entities/reports/containers.go
index d209efdac9..87214ffffd 100644
--- a/pkg/domain/entities/reports/containers.go
+++ b/pkg/domain/entities/reports/containers.go
@@ -1,7 +1,7 @@
 package reports
 
 type RmReport struct {
-	Id       string `json:"Id"` //nolint:revive
+	Id       string `json:"Id"`
 	Err      error  `json:"Err,omitempty"`
 	RawInput string `json:"-"`
 }
diff --git a/pkg/domain/entities/reports/prune.go b/pkg/domain/entities/reports/prune.go
index cf93fcbc4d..2965c0587c 100644
--- a/pkg/domain/entities/reports/prune.go
+++ b/pkg/domain/entities/reports/prune.go
@@ -1,7 +1,7 @@
 package reports
 
 type PruneReport struct {
-	Id   string `json:"Id"` //nolint:revive
+	Id   string `json:"Id"`
 	Err  error  `json:"Err,omitempty"`
 	Size uint64 `json:"Size"`
 }
diff --git a/pkg/domain/entities/reports/scp.go b/pkg/domain/entities/reports/scp.go
index 15b2b83f36..93d4636888 100644
--- a/pkg/domain/entities/reports/scp.go
+++ b/pkg/domain/entities/reports/scp.go
@@ -1,5 +1,5 @@
 package reports
 
 type ScpReport struct {
-	Id string `json:"Id"` //nolint:revive
+	Id string `json:"Id"`
 }
diff --git a/pkg/domain/entities/types.go b/pkg/domain/entities/types.go
index 65eafa969d..663d2df9cd 100644
--- a/pkg/domain/entities/types.go
+++ b/pkg/domain/entities/types.go
@@ -20,7 +20,7 @@ type Volume struct {
 }
 
 type Report struct {
-	Id  []string //nolint:revive
+	Id  []string
 	Err map[string]error
 }
 
diff --git a/pkg/domain/entities/types/containers.go b/pkg/domain/entities/types/containers.go
index 5ddb9fffb8..2a85a70eac 100644
--- a/pkg/domain/entities/types/containers.go
+++ b/pkg/domain/entities/types/containers.go
@@ -14,7 +14,7 @@ type ContainerStatReport struct {
 
 type CheckpointReport struct {
 	Err             error                                   `json:"-"`
-	Id              string                                  `json:"Id"` //nolint:revive
+	Id              string                                  `json:"Id"`
 	RawInput        string                                  `json:"-"`
 	RuntimeDuration int64                                   `json:"runtime_checkpoint_duration"`
 	CRIUStatistics  *define.CRIUCheckpointRestoreStatistics `json:"criu_statistics"`
@@ -22,7 +22,7 @@ type CheckpointReport struct {
 
 type RestoreReport struct {
 	Err             error                                   `json:"-"`
-	Id              string                                  `json:"Id"` //nolint:revive
+	Id              string                                  `json:"Id"`
 	RawInput        string                                  `json:"-"`
 	RuntimeDuration int64                                   `json:"runtime_restore_duration"`
 	CRIUStatistics  *define.CRIUCheckpointRestoreStatistics `json:"criu_statistics"`
diff --git a/pkg/domain/entities/types/images.go b/pkg/domain/entities/types/images.go
index 6c5075427f..05db387bff 100644
--- a/pkg/domain/entities/types/images.go
+++ b/pkg/domain/entities/types/images.go
@@ -10,7 +10,7 @@ import (
 // swagger:model LibpodImageSummary
 type ImageSummary struct {
 	ID          string `json:"Id"`
-	ParentId    string //nolint:revive
+	ParentId    string
 	RepoTags    []string
 	RepoDigests []string
 	Created     int64
@@ -34,7 +34,7 @@ type ImageSummary struct {
 	Os             string   `json:",omitempty"`
 }
 
-func (i *ImageSummary) Id() string { //nolint:revive
+func (i *ImageSummary) Id() string {
 	return i.ID
 }
 
@@ -59,7 +59,7 @@ type ImageLoadReport struct {
 }
 
 type ImageImportReport struct {
-	Id string //nolint:revive
+	Id string
 }
 
 // ImageSearchReport is the response from searching images.
@@ -90,7 +90,7 @@ type ShowTrustReport struct {
 
 // ImageMountReport describes the response from image mount
 type ImageMountReport struct {
-	Id           string //nolint:revive
+	Id           string
 	Name         string
 	Repositories []string
 	Path         string
@@ -99,7 +99,7 @@ type ImageMountReport struct {
 // ImageUnmountReport describes the response from umounting an image
 type ImageUnmountReport struct {
 	Err error
-	Id  string //nolint:revive
+	Id  string
 }
 
 // FarmInspectReport describes the response from farm inspect
diff --git a/pkg/domain/entities/types/network.go b/pkg/domain/entities/types/network.go
index 1fc212bd94..cf7a76936b 100644
--- a/pkg/domain/entities/types/network.go
+++ b/pkg/domain/entities/types/network.go
@@ -14,7 +14,7 @@ type NetworkPruneReport struct {
 
 // NetworkReloadReport describes the results of reloading a container network.
 type NetworkReloadReport struct {
-	Id  string //nolint:revive
+	Id  string
 	Err error
 }
 
diff --git a/pkg/domain/entities/types/pods.go b/pkg/domain/entities/types/pods.go
index 446d34d4de..8d150a89ed 100644
--- a/pkg/domain/entities/types/pods.go
+++ b/pkg/domain/entities/types/pods.go
@@ -9,47 +9,47 @@ import (
 
 type PodPruneReport struct {
 	Err error
-	Id  string //nolint:revive
+	Id  string
 }
 
 type PodPauseReport struct {
 	Errs []error
-	Id   string //nolint:revive
+	Id   string
 }
 type PodUnpauseReport struct {
 	Errs []error
-	Id   string //nolint:revive
+	Id   string
 }
 
 type PodStopReport struct {
 	Errs     []error
-	Id       string //nolint:revive
+	Id       string
 	RawInput string
 }
 
 type PodRestartReport struct {
 	Errs []error
-	Id   string //nolint:revive
+	Id   string
 }
 
 type PodStartReport struct {
 	Errs     []error
-	Id       string //nolint:revive
+	Id       string
 	RawInput string
 }
 
 type PodRmReport struct {
 	RemovedCtrs map[string]error
 	Err         error
-	Id          string //nolint:revive
+	Id          string
 }
 
 type PodCreateReport struct {
-	Id string //nolint:revive
+	Id string
 }
 
 type PodCloneReport struct {
-	Id string //nolint:revive
+	Id string
 }
 
 // PodStatsReport includes pod-resource statistics data.
@@ -95,15 +95,15 @@ type PodInspectReport struct {
 
 type PodKillReport struct {
 	Errs []error
-	Id   string //nolint:revive
+	Id   string
 }
 
 type ListPodsReport struct {
 	Cgroup     string
 	Containers []*ListPodContainer
 	Created    time.Time
-	Id         string //nolint:revive
-	InfraId    string //nolint:revive
+	Id         string
+	InfraId    string
 	Name       string
 	Namespace  string
 	// Network names connected to infra container
@@ -113,7 +113,7 @@ type ListPodsReport struct {
 }
 
 type ListPodContainer struct {
-	Id           string //nolint:revive
+	Id           string
 	Names        string
 	Status       string
 	RestartCount uint
diff --git a/pkg/domain/entities/types/volumes.go b/pkg/domain/entities/types/volumes.go
index 5f41d72038..a6e7f1659b 100644
--- a/pkg/domain/entities/types/volumes.go
+++ b/pkg/domain/entities/types/volumes.go
@@ -22,7 +22,7 @@ type VolumeCreateOptions struct {
 
 type VolumeRmReport struct {
 	Err error
-	Id  string //nolint:revive
+	Id  string
 }
 type VolumeInspectReport struct {
 	*VolumeConfigResponse
@@ -38,14 +38,14 @@ type VolumeReloadReport struct {
 
 type VolumeMountReport struct {
 	Err  error
-	Id   string //nolint:revive
+	Id   string
 	Name string
 	Path string
 }
 
 type VolumeUnmountReport struct {
 	Err error
-	Id  string //nolint:revive
+	Id  string
 }
 
 type VolumeConfigResponse struct {
diff --git a/pkg/errorhandling/errorhandling.go b/pkg/errorhandling/errorhandling.go
index 203cf89044..4ce6a89a9f 100644
--- a/pkg/errorhandling/errorhandling.go
+++ b/pkg/errorhandling/errorhandling.go
@@ -86,7 +86,7 @@ func Contains(err error, sub error) bool {
 // PodConflictErrorModel is used in remote connections with podman
 type PodConflictErrorModel struct {
 	Errs []string
-	Id   string //nolint:revive
+	Id   string
 }
 
 // ErrorModel is used in remote connections with podman
diff --git a/pkg/k8s.io/api/core/v1/resource.go b/pkg/k8s.io/api/core/v1/resource.go
index 7c9b6bd0e9..fb4e8556dc 100644
--- a/pkg/k8s.io/api/core/v1/resource.go
+++ b/pkg/k8s.io/api/core/v1/resource.go
@@ -26,8 +26,6 @@ func (rn ResourceName) String() string {
 }
 
 // Cpu returns the Cpu limit if specified.
-//
-//nolint:revive
 func (rl *ResourceList) Cpu() *resource.Quantity {
 	return rl.Name(ResourceCPU, resource.DecimalSI)
 }
diff --git a/pkg/machine/e2e/config_init_test.go b/pkg/machine/e2e/config_init_test.go
index 031f4395f7..23d25ec6e7 100644
--- a/pkg/machine/e2e/config_init_test.go
+++ b/pkg/machine/e2e/config_init_test.go
@@ -117,7 +117,7 @@ func (i *initMachine) withDiskSize(size uint) *initMachine {
 	return i
 }
 
-func (i *initMachine) withIgnitionPath(path string) *initMachine { //nolint:unused
+func (i *initMachine) withIgnitionPath(path string) *initMachine {
 	i.ignitionPath = path
 	return i
 }
diff --git a/pkg/machine/os/ostree.go b/pkg/machine/os/ostree.go
index 5998c2d3e0..f335129806 100644
--- a/pkg/machine/os/ostree.go
+++ b/pkg/machine/os/ostree.go
@@ -15,7 +15,7 @@ import (
 )
 
 // OSTree deals with operations on ostree based os's
-type OSTree struct { //nolint:revive
+type OSTree struct {
 }
 
 // Apply takes an OCI image and does an rpm-ostree rebase on the image
diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go
index 1a33ba3b01..c091212d54 100644
--- a/pkg/machine/qemu/machine.go
+++ b/pkg/machine/qemu/machine.go
@@ -201,7 +201,7 @@ func (q *QEMUStubber) stopLocked(mc *vmconfigs.MachineConfig) error {
 
 	if err := qmpMonitor.Disconnect(); err != nil {
 		// FIXME: this error should probably be returned
-		return nil //nolint: nilerr
+		return nil
 	}
 	disconnected = true
 
diff --git a/pkg/machine/shim/claim_unsupported.go b/pkg/machine/shim/claim_unsupported.go
index d9485df3df..78f0b1a63e 100644
--- a/pkg/machine/shim/claim_unsupported.go
+++ b/pkg/machine/shim/claim_unsupported.go
@@ -6,20 +6,14 @@ func findClaimHelper() string {
 	return ""
 }
 
-// All of these are unused on Windows but are used on Linux.
-// So we're just silencing Windows lint warnings here.
-
-//nolint:unused
 func dockerClaimHelperInstalled() bool {
 	return false
 }
 
-//nolint:unused
 func claimDockerSock() bool {
 	return false
 }
 
-//nolint:unused
 func dockerClaimSupported() bool {
 	return false
 }
diff --git a/pkg/machine/vmconfigs/config.go b/pkg/machine/vmconfigs/config.go
index a45fee6432..67cd6fbcc1 100644
--- a/pkg/machine/vmconfigs/config.go
+++ b/pkg/machine/vmconfigs/config.go
@@ -39,7 +39,7 @@ type MachineConfig struct {
 	QEMUHypervisor    *QEMUConfig    `json:",omitempty"`
 	WSLHypervisor     *WSLConfig     `json:",omitempty"`
 
-	lock *lockfile.LockFile //nolint:unused
+	lock *lockfile.LockFile
 
 	// configPath can be used for reading, writing, removing
 	configPath *define.VMFile
diff --git a/pkg/rootless/rootless.go b/pkg/rootless/rootless.go
index fd906e96d7..87a8157ec5 100644
--- a/pkg/rootless/rootless.go
+++ b/pkg/rootless/rootless.go
@@ -49,7 +49,7 @@ func TryJoinPauseProcess(pausePidPath string) (bool, int, error) {
 	if err != nil {
 		// It is still failing.  We can safely remove it.
 		os.Remove(pausePidPath)
-		return false, -1, nil //nolint: nilerr
+		return false, -1, nil
 	}
 	return became, ret, err
 }
diff --git a/pkg/specgen/generate/kube/seccomp.go b/pkg/specgen/generate/kube/seccomp.go
index 22659b0827..2bd6f8536c 100644
--- a/pkg/specgen/generate/kube/seccomp.go
+++ b/pkg/specgen/generate/kube/seccomp.go
@@ -13,8 +13,6 @@ import (
 
 // KubeSeccompPaths holds information about a pod YAML's seccomp configuration
 // it holds both container and pod seccomp paths
-//
-//nolint:revive
 type KubeSeccompPaths struct {
 	containerPaths map[string]string
 	podPath        string
diff --git a/pkg/specgen/generate/kube/volume.go b/pkg/specgen/generate/kube/volume.go
index 0ea7bb720e..0c25da8d12 100644
--- a/pkg/specgen/generate/kube/volume.go
+++ b/pkg/specgen/generate/kube/volume.go
@@ -25,7 +25,6 @@ const (
 	kubeFilePermission = 0644
 )
 
-//nolint:revive
 type KubeVolumeType int
 
 const (
@@ -40,7 +39,6 @@ const (
 	KubeVolumeTypeImage
 )
 
-//nolint:revive
 type KubeVolume struct {
 	// Type of volume to create
 	Type KubeVolumeType
diff --git a/pkg/specgen/specgen.go b/pkg/specgen/specgen.go
index bbe4a2588b..a8ebd6170e 100644
--- a/pkg/specgen/specgen.go
+++ b/pkg/specgen/specgen.go
@@ -629,8 +629,7 @@ type SpecGenerator struct {
 	ContainerResourceConfig
 	ContainerHealthCheckConfig
 
-	//nolint:unused // this is needed for the local client but golangci-lint
-	// does not seems to happy when we test the remote stub
+	//nolint:nolintlint,unused // "unused" complains when remote build tag is used, "nolintlint" complains otherwise.
 	cacheLibImage
 }
 
diff --git a/test/e2e/artifact_test.go b/test/e2e/artifact_test.go
index 5cec15624e..f14540ea50 100644
--- a/test/e2e/artifact_test.go
+++ b/test/e2e/artifact_test.go
@@ -14,14 +14,10 @@ import (
 )
 
 const (
-	//nolint:revive
-	ARTIFACT_SINGLE = "quay.io/libpod/testartifact:20250206-single"
-	//nolint:revive
-	ARTIFACT_MULTI = "quay.io/libpod/testartifact:20250206-multi"
-	//nolint:revive
+	ARTIFACT_SINGLE         = "quay.io/libpod/testartifact:20250206-single"
+	ARTIFACT_MULTI          = "quay.io/libpod/testartifact:20250206-multi"
 	ARTIFACT_MULTI_NO_TITLE = "quay.io/libpod/testartifact:20250206-multi-no-title"
-	//nolint:revive
-	ARTIFACT_EVIL = "quay.io/libpod/testartifact:20250206-evil"
+	ARTIFACT_EVIL           = "quay.io/libpod/testartifact:20250206-evil"
 )
 
 var _ = Describe("Podman artifact", func() {
diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go
index adf9115b44..e97b5b471b 100644
--- a/test/e2e/common_test.go
+++ b/test/e2e/common_test.go
@@ -44,10 +44,10 @@ import (
 
 var (
 	//lint:ignore ST1003
-	PODMAN_BINARY      string                              //nolint:revive
-	INTEGRATION_ROOT   string                              //nolint:revive
-	CGROUP_MANAGER     = "systemd"                         //nolint:revive
-	RESTORE_IMAGES     = []string{ALPINE, BB, NGINX_IMAGE} //nolint:revive
+	PODMAN_BINARY      string
+	INTEGRATION_ROOT   string
+	CGROUP_MANAGER     = "systemd"
+	RESTORE_IMAGES     = []string{ALPINE, BB, NGINX_IMAGE}
 	defaultWaitTimeout = 90
 	CGROUPSV2, _       = cgroups.IsCgroup2UnifiedMode()
 )
diff --git a/test/e2e/config.go b/test/e2e/config.go
index 81c362ce90..ed468d5646 100644
--- a/test/e2e/config.go
+++ b/test/e2e/config.go
@@ -3,7 +3,7 @@
 package integration
 
 var (
-	REDIS_IMAGE       = "quay.io/libpod/redis:alpine" //nolint:revive
+	REDIS_IMAGE       = "quay.io/libpod/redis:alpine"
 	fedoraMinimal     = "quay.io/libpod/systemd-image:20240124"
 	ALPINE            = "quay.io/libpod/alpine:latest"
 	ALPINELISTTAG     = "quay.io/libpod/alpine:3.10.2"
@@ -12,9 +12,9 @@ var (
 	ALPINEAMD64ID     = "961769676411f082461f9ef46626dd7a2d1e2b2a38e6a44364bcbecf51e66dd4"
 	ALPINEARM64DIGEST = "quay.io/libpod/alpine@sha256:f270dcd11e64b85919c3bab66886e59d677cf657528ac0e4805d3c71e458e525"
 	ALPINEARM64ID     = "915beeae46751fc564998c79e73a1026542e945ca4f73dc841d09ccc6c2c0672"
-	INFRA_IMAGE       = "quay.io/libpod/k8s-pause:3.5" //nolint:revive
+	INFRA_IMAGE       = "quay.io/libpod/k8s-pause:3.5"
 	BB                = "quay.io/libpod/busybox:latest"
-	HEALTHCHECK_IMAGE = "quay.io/libpod/alpine_healthcheck:latest" //nolint:revive
+	HEALTHCHECK_IMAGE = "quay.io/libpod/alpine_healthcheck:latest"
 	volumeTest        = "quay.io/libpod/volume-plugin-test-img:20220623"
 
 	// ImageCacheDir is initialized at runtime.
diff --git a/test/e2e/config_amd64.go b/test/e2e/config_amd64.go
index dea90c1740..de65da56af 100644
--- a/test/e2e/config_amd64.go
+++ b/test/e2e/config_amd64.go
@@ -3,14 +3,14 @@
 package integration
 
 var (
-	STORAGE_FS          = "overlay"                                                                                                                   //nolint:revive
-	STORAGE_OPTIONS     = "--storage-driver overlay"                                                                                                  //nolint:revive
-	ROOTLESS_STORAGE_FS = "overlay"                                                                                                                   //nolint:revive
-	CACHE_IMAGES        = []string{ALPINE, BB, NGINX_IMAGE, REDIS_IMAGE, REGISTRY_IMAGE, INFRA_IMAGE, CITEST_IMAGE, HEALTHCHECK_IMAGE, SYSTEMD_IMAGE} //nolint:revive
-	NGINX_IMAGE         = "quay.io/libpod/alpine_nginx:latest"                                                                                        //nolint:revive
-	BB_GLIBC            = "docker.io/library/busybox:glibc"                                                                                           //nolint:revive
-	REGISTRY_IMAGE      = "quay.io/libpod/registry:2.8.2"                                                                                             //nolint:revive
-	CITEST_IMAGE        = "quay.io/libpod/testimage:20241011"                                                                                         //nolint:revive
-	SYSTEMD_IMAGE       = "quay.io/libpod/systemd-image:20240124"                                                                                     //nolint:revive
-	CIRROS_IMAGE        = "quay.io/libpod/cirros:latest"                                                                                              //nolint:revive
+	STORAGE_FS          = "overlay"
+	STORAGE_OPTIONS     = "--storage-driver overlay"
+	ROOTLESS_STORAGE_FS = "overlay"
+	CACHE_IMAGES        = []string{ALPINE, BB, NGINX_IMAGE, REDIS_IMAGE, REGISTRY_IMAGE, INFRA_IMAGE, CITEST_IMAGE, HEALTHCHECK_IMAGE, SYSTEMD_IMAGE}
+	NGINX_IMAGE         = "quay.io/libpod/alpine_nginx:latest"
+	BB_GLIBC            = "docker.io/library/busybox:glibc"
+	REGISTRY_IMAGE      = "quay.io/libpod/registry:2.8.2"
+	CITEST_IMAGE        = "quay.io/libpod/testimage:20241011"
+	SYSTEMD_IMAGE       = "quay.io/libpod/systemd-image:20240124"
+	CIRROS_IMAGE        = "quay.io/libpod/cirros:latest"
 )
diff --git a/test/utils/utils.go b/test/utils/utils.go
index e6e3f0706a..0640c00f06 100644
--- a/test/utils/utils.go
+++ b/test/utils/utils.go
@@ -20,9 +20,9 @@ import (
 
 	"github.com/sirupsen/logrus"
 
-	. "github.com/onsi/ginkgo/v2"    //nolint:revive
-	. "github.com/onsi/gomega"       //nolint:revive
-	. "github.com/onsi/gomega/gexec" //nolint:revive
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+	. "github.com/onsi/gomega/gexec"
 )
 
 type NetworkBackend int