diff --git a/pkg/api/handlers/compat/events.go b/pkg/api/handlers/compat/events.go
index f883c2c826..ec6362fb51 100644
--- a/pkg/api/handlers/compat/events.go
+++ b/pkg/api/handlers/compat/events.go
@@ -95,11 +95,16 @@ func GetEvents(w http.ResponseWriter, r *http.Request) {
 			e := entities.ConvertToEntitiesEvent(*evt.Event)
 			// Some events differ between Libpod and Docker endpoints.
 			// Handle these differences for Docker-compat.
-			if !utils.IsLibpodRequest(r) && e.Type == "image" && e.Status == "remove" {
+			if !utils.IsLibpodRequest(r) && e.Type == "image" && e.Action == "remove" {
+				// Status is deprecated, but we still like to set it for consumers that might use it.
+				//nolint:staticcheck,nolintlint // we run the linter several times and sometimes it
+				// complains about this and sometimes it doesn't thus the nolintlint
 				e.Status = "delete"
 				e.Action = "delete"
 			}
-			if !utils.IsLibpodRequest(r) && e.Status == "died" {
+			if !utils.IsLibpodRequest(r) && e.Action == "died" {
+				//nolint:staticcheck,nolintlint // we run the linter several times and sometimes it
+				// complains about this and sometimes it doesn't thus the nolintlint
 				e.Status = "die"
 				e.Action = "die"
 				e.Actor.Attributes["exitCode"] = e.Actor.Attributes["containerExitCode"]
diff --git a/pkg/domain/infra/tunnel/containers.go b/pkg/domain/infra/tunnel/containers.go
index f75d9b44f9..6372c0adda 100644
--- a/pkg/domain/infra/tunnel/containers.go
+++ b/pkg/domain/infra/tunnel/containers.go
@@ -578,7 +578,6 @@ func makeExecConfig(options entities.ExecOptions) *handlers.ExecCreateConfig {
 	createConfig.AttachStdin = options.Interactive
 	createConfig.AttachStdout = true
 	createConfig.AttachStderr = true
-	createConfig.Detach = false
 	createConfig.DetachKeys = options.DetachKeys
 	createConfig.Env = env
 	createConfig.WorkingDir = options.WorkDir