diff --git a/daemon/archive_windows.go b/daemon/archive_windows.go
index d6de9312e3..7bb9ca30d0 100644
--- a/daemon/archive_windows.go
+++ b/daemon/archive_windows.go
@@ -302,7 +302,7 @@ func (daemon *Daemon) containerCopy(container *container.Container, resource str
 // loaded inside the utility VM, not the host.
 // IMPORTANT: The container lock MUST be held when calling this function.
 func (daemon *Daemon) isOnlineFSOperationPermitted(ctr *container.Container) error {
-	if !ctr.Running {
+	if !ctr.State.Running {
 		return nil
 	}
 
diff --git a/daemon/attach.go b/daemon/attach.go
index 479ece6bc7..f445adff50 100644
--- a/daemon/attach.go
+++ b/daemon/attach.go
@@ -33,10 +33,10 @@ func (daemon *Daemon) ContainerAttach(prefixOrName string, req *backend.Containe
 	if err != nil {
 		return err
 	}
-	if ctr.IsPaused() {
+	if ctr.State.IsPaused() {
 		return errdefs.Conflict(fmt.Errorf("container %s is paused, unpause the container before attach", prefixOrName))
 	}
-	if ctr.IsRestarting() {
+	if ctr.State.IsRestarting() {
 		return errdefs.Conflict(fmt.Errorf("container %s is restarting, wait until the container is running", prefixOrName))
 	}
 
@@ -192,7 +192,7 @@ func (daemon *Daemon) containerAttach(ctr *container.Container, cfg *stream.Atta
 
 	if ctr.Config.StdinOnce && !ctr.Config.Tty {
 		// Wait for the container to stop before returning.
-		waitChan := ctr.Wait(context.Background(), containertypes.WaitConditionNotRunning)
+		waitChan := ctr.State.Wait(context.Background(), containertypes.WaitConditionNotRunning)
 		defer func() {
 			<-waitChan // Ignore returned exit code.
 		}()
diff --git a/daemon/changes.go b/daemon/changes.go
index d82ed66d90..3a6d81107d 100644
--- a/daemon/changes.go
+++ b/daemon/changes.go
@@ -18,7 +18,7 @@ func (daemon *Daemon) ContainerChanges(ctx context.Context, name string) ([]arch
 		return nil, err
 	}
 
-	if isWindows && container.IsRunning() {
+	if isWindows && container.State.IsRunning() {
 		return nil, errors.New("Windows does not support diff of a running container")
 	}
 
diff --git a/daemon/commit.go b/daemon/commit.go
index 4be1cc2d18..5a3de2d532 100644
--- a/daemon/commit.go
+++ b/daemon/commit.go
@@ -132,19 +132,19 @@ func (daemon *Daemon) CreateImageFromContainer(ctx context.Context, name string,
 	}
 
 	// It is not possible to commit a running container on Windows
-	if isWindows && container.IsRunning() {
+	if isWindows && container.State.IsRunning() {
 		return "", errors.Errorf("%+v does not support commit of a running container", runtime.GOOS)
 	}
 
-	if container.IsDead() {
+	if container.State.IsDead() {
 		return "", errdefs.Conflict(fmt.Errorf("You cannot commit container %s which is Dead", container.ID))
 	}
 
-	if container.IsRemovalInProgress() {
+	if container.State.IsRemovalInProgress() {
 		return "", errdefs.Conflict(fmt.Errorf("You cannot commit container %s which is being removed", container.ID))
 	}
 
-	if c.Pause && !container.IsPaused() {
+	if c.Pause && !container.State.IsPaused() {
 		daemon.containerPause(container)
 		defer daemon.containerUnpause(container)
 	}
diff --git a/daemon/container/container.go b/daemon/container/container.go
index 2fa4aaa441..349bab718d 100644
--- a/daemon/container/container.go
+++ b/daemon/container/container.go
@@ -535,7 +535,11 @@ func (container *Container) GetExecIDs() []string {
 // ShouldRestart decides whether the daemon should restart the container or not.
 // This is based on the container's restart policy.
 func (container *Container) ShouldRestart() bool {
-	shouldRestart, _, _ := container.RestartManager().ShouldRestart(uint32(container.ExitCode()), container.HasBeenManuallyStopped, container.FinishedAt.Sub(container.StartedAt))
+	shouldRestart, _, _ := container.RestartManager().ShouldRestart(
+		uint32(container.State.ExitCode()),
+		container.HasBeenManuallyStopped,
+		container.State.FinishedAt.Sub(container.State.StartedAt),
+	)
 	return shouldRestart
 }
 
@@ -837,11 +841,11 @@ func (container *Container) RestoreTask(ctx context.Context, client libcontainer
 	container.Lock()
 	defer container.Unlock()
 	var err error
-	container.ctr, err = client.LoadContainer(ctx, container.ID)
+	container.State.ctr, err = client.LoadContainer(ctx, container.ID)
 	if err != nil {
 		return err
 	}
-	container.task, err = container.ctr.AttachTask(ctx, container.InitializeStdio)
+	container.State.task, err = container.State.ctr.AttachTask(ctx, container.InitializeStdio)
 	if err != nil && !cerrdefs.IsNotFound(err) {
 		return err
 	}
@@ -857,10 +861,10 @@ func (container *Container) RestoreTask(ctx context.Context, client libcontainer
 //
 // The container lock must be held when calling this method.
 func (container *Container) GetRunningTask() (libcontainerdtypes.Task, error) {
-	if !container.Running {
+	if !container.State.Running {
 		return nil, errdefs.Conflict(fmt.Errorf("container %s is not running", container.ID))
 	}
-	tsk, ok := container.Task()
+	tsk, ok := container.State.Task()
 	if !ok {
 		return nil, errdefs.System(errors.WithStack(fmt.Errorf("container %s is in Running state but has no containerd Task set", container.ID)))
 	}
diff --git a/daemon/container/view.go b/daemon/container/view.go
index 26c4905ec9..646359b8d3 100644
--- a/daemon/container/view.go
+++ b/daemon/container/view.go
@@ -294,14 +294,9 @@ func (v *View) GetAllNames() map[string][]string {
 func (v *View) transform(ctr *Container) *Snapshot {
 	health := container.NoHealthcheck
 	failingStreak := 0
-	if ctr.Health != nil {
-		health = ctr.Health.Status()
-		failingStreak = ctr.Health.FailingStreak
-	}
-
-	healthSummary := &container.HealthSummary{
-		Status:        health,
-		FailingStreak: failingStreak,
+	if ctr.State.Health != nil {
+		health = ctr.State.Health.Status()
+		failingStreak = ctr.State.Health.FailingStreak
 	}
 
 	snapshot := &Snapshot{
@@ -313,20 +308,23 @@ func (v *View) transform(ctr *Container) *Snapshot {
 			Mounts:  ctr.GetMountPoints(),
 			State:   ctr.State.StateString(),
 			Status:  ctr.State.String(),
-			Health:  healthSummary,
+			Health: &container.HealthSummary{
+				Status:        health,
+				FailingStreak: failingStreak,
+			},
 			Created: ctr.Created.Unix(),
 		},
 		CreatedAt:    ctr.Created,
-		StartedAt:    ctr.StartedAt,
+		StartedAt:    ctr.State.StartedAt,
 		Name:         ctr.Name,
-		Pid:          ctr.Pid,
+		Pid:          ctr.State.Pid,
 		Managed:      ctr.Managed,
 		ExposedPorts: make(container.PortSet),
 		PortBindings: make(container.PortSet),
 		Health:       health,
-		Running:      ctr.Running,
-		Paused:       ctr.Paused,
-		ExitCode:     ctr.ExitCode(),
+		Running:      ctr.State.Running,
+		Paused:       ctr.State.Paused,
+		ExitCode:     ctr.State.ExitCode(),
 	}
 
 	if snapshot.Names == nil {
diff --git a/daemon/container/view_test.go b/daemon/container/view_test.go
index 0bef51e779..4e91ed5fd9 100644
--- a/daemon/container/view_test.go
+++ b/daemon/container/view_test.go
@@ -41,10 +41,10 @@ func TestViewAll(t *testing.T) {
 	one := newContainer(t, tmpDir)
 	two := newContainer(t, tmpDir)
 
-	one.Pid = 10
+	one.State.Pid = 10
 	assert.NilError(t, one.CheckpointTo(context.Background(), db))
 
-	two.Pid = 20
+	two.State.Pid = 20
 	assert.NilError(t, two.CheckpointTo(context.Background(), db))
 
 	all, err := db.Snapshot().All()
@@ -56,8 +56,8 @@ func TestViewAll(t *testing.T) {
 		byID[c.ID] = c.Pid
 	}
 	expected := map[string]int{
-		one.ID: one.Pid,
-		two.ID: two.Pid,
+		one.ID: one.State.Pid,
+		two.ID: two.State.Pid,
 	}
 	assert.DeepEqual(t, expected, byID)
 }
@@ -146,7 +146,7 @@ func TestViewWithHealthCheck(t *testing.T) {
 	tmpDir := t.TempDir()
 	one := newContainer(t, tmpDir)
 
-	one.Health = &Health{
+	one.State.Health = &Health{
 		Health: container.Health{
 			Status: container.Starting,
 		},
diff --git a/daemon/container_operations.go b/daemon/container_operations.go
index ae75d4f30e..0a9f89b7ee 100644
--- a/daemon/container_operations.go
+++ b/daemon/container_operations.go
@@ -939,10 +939,10 @@ func (daemon *Daemon) getNetworkedContainer(containerID, connectedContainerPrefi
 		// FIXME (thaJeztah): turns out we don't validate "--network container:<self>" during container create!
 		return nil, errdefs.System(errdefs.InvalidParameter(errors.New("cannot join own network namespace")))
 	}
-	if !nc.IsRunning() {
-		return nil, errdefs.Conflict(fmt.Errorf("cannot join network namespace of a non running container: container %s is %s", strings.TrimPrefix(nc.Name, "/"), nc.StateString()))
+	if !nc.State.IsRunning() {
+		return nil, errdefs.Conflict(fmt.Errorf("cannot join network namespace of a non running container: container %s is %s", strings.TrimPrefix(nc.Name, "/"), nc.State.StateString()))
 	}
-	if nc.IsRestarting() {
+	if nc.State.IsRestarting() {
 		return nil, fmt.Errorf("cannot join network namespace of container: %w", errContainerIsRestarting(connectedContainerPrefixOrName))
 	}
 	return nc, nil
@@ -1015,8 +1015,8 @@ func (daemon *Daemon) ConnectToNetwork(ctx context.Context, ctr *container.Conta
 	ctr.Lock()
 	defer ctr.Unlock()
 
-	if !ctr.Running {
-		if ctr.RemovalInProgress || ctr.Dead {
+	if !ctr.State.Running {
+		if ctr.State.RemovalInProgress || ctr.State.Dead {
 			return errRemovalContainer(ctr.ID)
 		}
 
@@ -1048,8 +1048,8 @@ func (daemon *Daemon) DisconnectFromNetwork(ctx context.Context, ctr *container.
 	ctr.Lock()
 	defer ctr.Unlock()
 
-	if !ctr.Running || (err != nil && force) {
-		if ctr.RemovalInProgress || ctr.Dead {
+	if !ctr.State.Running || (err != nil && force) {
+		if ctr.State.RemovalInProgress || ctr.State.Dead {
 			return errRemovalContainer(ctr.ID)
 		}
 		// In case networkName is resolved we will use n.Name()
diff --git a/daemon/container_operations_unix.go b/daemon/container_operations_unix.go
index c402dce693..abe656063c 100644
--- a/daemon/container_operations_unix.go
+++ b/daemon/container_operations_unix.go
@@ -37,7 +37,7 @@ func (daemon *Daemon) setupLinkedContainers(ctr *container.Container) ([]string,
 
 	var env []string
 	for linkAlias, child := range daemon.linkIndex.children(ctr) {
-		if !child.IsRunning() {
+		if !child.State.IsRunning() {
 			return nil, fmt.Errorf("Cannot link to a non running container: %s AS %s", child.Name, linkAlias)
 		}
 
@@ -153,10 +153,10 @@ func (daemon *Daemon) getIPCContainer(id string) (*container.Container, error) {
 	if err != nil {
 		return nil, errdefs.InvalidParameter(err)
 	}
-	if !ctr.IsRunning() {
+	if !ctr.State.IsRunning() {
 		return nil, errNotRunning(id)
 	}
-	if ctr.IsRestarting() {
+	if ctr.State.IsRestarting() {
 		return nil, errContainerIsRestarting(id)
 	}
 
@@ -177,10 +177,10 @@ func (daemon *Daemon) getPIDContainer(id string) (*container.Container, error) {
 	if err != nil {
 		return nil, errdefs.InvalidParameter(err)
 	}
-	if !ctr.IsRunning() {
+	if !ctr.State.IsRunning() {
 		return nil, errNotRunning(id)
 	}
-	if ctr.IsRestarting() {
+	if ctr.State.IsRestarting() {
 		return nil, errContainerIsRestarting(id)
 	}
 
@@ -458,7 +458,7 @@ func (daemon *Daemon) cleanupSecretDir(ctr *container.Container) {
 }
 
 func killProcessDirectly(ctr *container.Container) error {
-	pid := ctr.GetPID()
+	pid := ctr.State.GetPID()
 	if pid == 0 {
 		// Ensure that we don't kill ourselves
 		return nil
diff --git a/daemon/containerd/image_delete.go b/daemon/containerd/image_delete.go
index ae56e1b364..4d09dc477d 100644
--- a/daemon/containerd/image_delete.go
+++ b/daemon/containerd/image_delete.go
@@ -494,7 +494,7 @@ func (i *ImageService) untagReferences(ctx context.Context, refs []c8dimages.Ima
 func (i *ImageService) checkImageDeleteConflict(ctx context.Context, imgID image.ID, all []c8dimages.Image, mask conflictType) error {
 	if mask&conflictRunningContainer != 0 {
 		running := func(c *container.Container) bool {
-			return c.ImageID == imgID && c.IsRunning()
+			return c.ImageID == imgID && c.State.IsRunning()
 		}
 		if ctr := i.containers.First(running); ctr != nil {
 			return &imageDeleteConflict{
@@ -508,7 +508,7 @@ func (i *ImageService) checkImageDeleteConflict(ctx context.Context, imgID image
 
 	if mask&conflictStoppedContainer != 0 {
 		stopped := func(c *container.Container) bool {
-			return !c.IsRunning() && c.ImageID == imgID
+			return !c.State.IsRunning() && c.ImageID == imgID
 		}
 		if ctr := i.containers.First(stopped); ctr != nil {
 			return &imageDeleteConflict{
diff --git a/daemon/daemon.go b/daemon/daemon.go
index c8478bc7ff..de21417b28 100644
--- a/daemon/daemon.go
+++ b/daemon/daemon.go
@@ -296,8 +296,8 @@ func (daemon *Daemon) restore(ctx context.Context, cfg *configStore, containers
 			}
 			c.RWLayer = rwlayer
 			logger.WithFields(log.Fields{
-				"running": c.IsRunning(),
-				"paused":  c.IsPaused(),
+				"running": c.State.IsRunning(),
+				"paused":  c.State.IsPaused(),
 			}).Debug("loaded container")
 
 			if err := daemon.registerName(c); err != nil {
@@ -376,9 +376,9 @@ func (daemon *Daemon) restore(ctx context.Context, cfg *configStore, containers
 
 			logger := func(c *container.Container) *log.Entry {
 				return baseLogger.WithFields(log.Fields{
-					"running":    c.IsRunning(),
-					"paused":     c.IsPaused(),
-					"restarting": c.IsRestarting(),
+					"running":    c.State.IsRunning(),
+					"paused":     c.State.IsPaused(),
+					"restarting": c.State.IsRestarting(),
 				})
 			}
 
@@ -393,7 +393,7 @@ func (daemon *Daemon) restore(ctx context.Context, cfg *configStore, containers
 
 			alive := false
 			status := containerd.Unknown
-			if tsk, ok := c.Task(); ok {
+			if tsk, ok := c.State.Task(); ok {
 				s, err := tsk.Status(context.Background())
 				if err != nil {
 					logger(c).WithError(err).Error("failed to get task status")
@@ -422,13 +422,13 @@ func (daemon *Daemon) restore(ctx context.Context, cfg *configStore, containers
 			// If the containerd task for the container was not found, docker's view of the
 			// container state will be updated accordingly via SetStopped further down.
 
-			if c.IsRunning() || c.IsPaused() {
+			if c.State.IsRunning() || c.State.IsPaused() {
 				logger(c).Debug("syncing container on disk state with real state")
 
 				c.RestartManager().Cancel() // manually start containers because some need to wait for swarm networking
 
 				switch {
-				case c.IsPaused() && alive:
+				case c.State.IsPaused() && alive:
 					logger(c).WithField("state", status).Info("restored container paused")
 					switch status {
 					case containerd.Paused, containerd.Pausing:
@@ -438,7 +438,7 @@ func (daemon *Daemon) restore(ctx context.Context, cfg *configStore, containers
 					default:
 						// running
 						c.Lock()
-						c.Paused = false
+						c.State.Paused = false
 						daemon.setStateCounter(c)
 						daemon.initHealthMonitor(c)
 						if err := c.CheckpointTo(context.TODO(), daemon.containersReplica); err != nil {
@@ -446,7 +446,7 @@ func (daemon *Daemon) restore(ctx context.Context, cfg *configStore, containers
 						}
 						c.Unlock()
 					}
-				case !c.IsPaused() && alive:
+				case !c.State.IsPaused() && alive:
 					logger(c).Debug("restoring healthcheck")
 					c.Lock()
 					daemon.initHealthMonitor(c)
@@ -463,7 +463,7 @@ func (daemon *Daemon) restore(ctx context.Context, cfg *configStore, containers
 					} else {
 						ces.ExitCode = 255
 					}
-					c.SetStopped(&ces)
+					c.State.SetStopped(&ces)
 					daemon.Cleanup(context.TODO(), c)
 					if err := c.CheckpointTo(context.TODO(), daemon.containersReplica); err != nil {
 						baseLogger.WithError(err).Error("failed to update stopped container state")
@@ -488,7 +488,7 @@ func (daemon *Daemon) restore(ctx context.Context, cfg *configStore, containers
 				}
 
 				c.ResetRestartManager(false)
-				if !c.HostConfig.NetworkMode.IsContainer() && c.IsRunning() {
+				if !c.HostConfig.NetworkMode.IsContainer() && c.State.IsRunning() {
 					options, err := buildSandboxOptions(&cfg.Config, c)
 					if err != nil {
 						logger(c).WithError(err).Warn("failed to build sandbox option to restore container")
@@ -522,7 +522,7 @@ func (daemon *Daemon) restore(ctx context.Context, cfg *configStore, containers
 
 			c.Lock()
 			// TODO(thaJeztah): we no longer persist RemovalInProgress on disk, so this code is likely redundant; see https://github.com/moby/moby/pull/49968
-			if c.RemovalInProgress {
+			if c.State.RemovalInProgress {
 				// We probably crashed in the middle of a removal, reset
 				// the flag.
 				//
@@ -531,8 +531,8 @@ func (daemon *Daemon) restore(ctx context.Context, cfg *configStore, containers
 				// associated volumes, network links or both to also
 				// be removed. So we put the container in the "dead"
 				// state and leave further processing up to them.
-				c.RemovalInProgress = false
-				c.Dead = true
+				c.State.RemovalInProgress = false
+				c.State.Dead = true
 				if err := c.CheckpointTo(context.TODO(), daemon.containersReplica); err != nil {
 					baseLogger.WithError(err).Error("failed to update RemovalInProgress container state")
 				} else {
@@ -695,7 +695,7 @@ func (daemon *Daemon) restartSwarmContainers(ctx context.Context, cfg *configSto
 	sem := semaphore.NewWeighted(int64(parallelLimit))
 
 	for _, c := range daemon.List() {
-		if !c.IsRunning() && !c.IsPaused() {
+		if !c.State.IsRunning() && !c.State.IsPaused() {
 			// Autostart all the containers which has a
 			// swarm endpoint now that the cluster is
 			// initialized.
@@ -1422,7 +1422,7 @@ func (daemon *Daemon) shutdownContainer(c *container.Container) error {
 
 	// Wait without timeout for the container to exit.
 	// Ignore the result.
-	<-c.Wait(ctx, containertypes.WaitConditionNotRunning)
+	<-c.State.Wait(ctx, containertypes.WaitConditionNotRunning)
 	return nil
 }
 
@@ -1479,7 +1479,7 @@ func (daemon *Daemon) Shutdown(ctx context.Context) error {
 		log.G(ctx).Debugf("daemon configured with a %d seconds minimum shutdown timeout", cfg.ShutdownTimeout)
 		log.G(ctx).Debugf("start clean shutdown of all containers with a %d seconds timeout...", daemon.shutdownTimeout(cfg))
 		daemon.containers.ApplyAll(func(c *container.Container) {
-			if !c.IsRunning() {
+			if !c.State.IsRunning() {
 				return
 			}
 			logger := log.G(ctx).WithField("container", c.ID)
diff --git a/daemon/delete.go b/daemon/delete.go
index 572ca6b5c0..c5983ea90c 100644
--- a/daemon/delete.go
+++ b/daemon/delete.go
@@ -36,11 +36,11 @@ func (daemon *Daemon) containerRm(cfg *config.Config, name string, opts *backend
 	}
 
 	// Container state RemovalInProgress should be used to avoid races.
-	if inProgress := ctr.SetRemovalInProgress(); inProgress {
+	if inProgress := ctr.State.SetRemovalInProgress(); inProgress {
 		err := fmt.Errorf("removal of container %s is already in progress", name)
 		return errdefs.Conflict(err)
 	}
-	defer ctr.ResetRemovalInProgress()
+	defer ctr.State.ResetRemovalInProgress()
 
 	// check if container wasn't deregistered by previous rm since Get
 	if c := daemon.containers.Get(ctr.ID); c == nil {
@@ -87,12 +87,12 @@ func (daemon *Daemon) rmLink(cfg *config.Config, ctr *container.Container, name
 // cleanupContainer unregisters a container from the daemon, stops stats
 // collection and cleanly removes contents and metadata from the filesystem.
 func (daemon *Daemon) cleanupContainer(ctr *container.Container, config backend.ContainerRmConfig) error {
-	if ctr.IsRunning() {
+	if ctr.State.IsRunning() {
 		if !config.ForceRemove {
-			if ctr.Paused {
+			if ctr.State.Paused {
 				return errdefs.Conflict(errors.New("container is paused and must be unpaused first"))
 			} else {
-				return errdefs.Conflict(fmt.Errorf("container is %s: stop the container before removing or force remove", ctr.StateString()))
+				return errdefs.Conflict(fmt.Errorf("container is %s: stop the container before removing or force remove", ctr.State.StateString()))
 			}
 		}
 		if err := daemon.Kill(ctr); err != nil && !isNotRunning(err) {
@@ -122,7 +122,7 @@ func (daemon *Daemon) cleanupContainer(ctr *container.Container, config backend.
 
 	// Mark container dead. We don't want anybody to be restarting it.
 	ctr.Lock()
-	ctr.Dead = true
+	ctr.State.Dead = true
 
 	// Copy RWLayer for releasing and clear the reference while holding the container lock.
 	rwLayer := ctr.RWLayer
@@ -144,7 +144,7 @@ func (daemon *Daemon) cleanupContainer(ctr *container.Container, config backend.
 			ctr.Lock()
 			ctr.RWLayer = rwLayer
 			ctr.Unlock()
-			ctr.SetRemovalError(err)
+			ctr.State.SetRemovalError(err)
 			return err
 		}
 	}
@@ -160,7 +160,7 @@ func (daemon *Daemon) cleanupContainer(ctr *container.Container, config backend.
 	ctr.Unlock()
 	if err != nil {
 		err = errors.Wrap(err, "unable to remove filesystem")
-		ctr.SetRemovalError(err)
+		ctr.State.SetRemovalError(err)
 		return err
 	}
 
@@ -174,7 +174,7 @@ func (daemon *Daemon) cleanupContainer(ctr *container.Container, config backend.
 	for _, name := range linkNames {
 		daemon.releaseName(name)
 	}
-	ctr.SetRemoved()
+	ctr.State.SetRemoved()
 	metrics.StateCtr.Delete(ctr.ID)
 
 	daemon.LogContainerEvent(ctr, events.ActionDestroy)
diff --git a/daemon/delete_test.go b/daemon/delete_test.go
index 28ad4de918..70d83181dd 100644
--- a/daemon/delete_test.go
+++ b/daemon/delete_test.go
@@ -53,8 +53,8 @@ func TestContainerDelete(t *testing.T) {
 			errMsg: "container is restarting: stop the container before removing or force remove",
 			initContainer: func() *container.Container {
 				c := newContainerWithState(container.NewState())
-				c.SetRunning(nil, nil, time.Now())
-				c.SetRestarting(&container.ExitStatus{})
+				c.State.SetRunning(nil, nil, time.Now())
+				c.State.SetRestarting(&container.ExitStatus{})
 				return c
 			},
 		},
@@ -85,7 +85,7 @@ func TestContainerDoubleDelete(t *testing.T) {
 	c := newContainerWithState(container.NewState())
 
 	// Mark the container as having a delete in progress
-	c.SetRemovalInProgress()
+	c.State.SetRemovalInProgress()
 
 	d, cleanup := newDaemonWithTmpRoot(t)
 	defer cleanup()
diff --git a/daemon/exec.go b/daemon/exec.go
index 09f0be6e6c..204b49fb06 100644
--- a/daemon/exec.go
+++ b/daemon/exec.go
@@ -57,13 +57,13 @@ func (daemon *Daemon) getExecConfig(name string) (*container.ExecConfig, error)
 	if ctr == nil {
 		return nil, containerNotFound(name)
 	}
-	if !ctr.IsRunning() {
+	if !ctr.State.IsRunning() {
 		return nil, errNotRunning(ctr.ID)
 	}
-	if ctr.IsPaused() {
+	if ctr.State.IsPaused() {
 		return nil, errExecPaused(ctr.ID)
 	}
-	if ctr.IsRestarting() {
+	if ctr.State.IsRestarting() {
 		return nil, errContainerIsRestarting(ctr.ID)
 	}
 	return ec, nil
@@ -80,13 +80,13 @@ func (daemon *Daemon) getActiveContainer(name string) (*container.Container, err
 		return nil, err
 	}
 
-	if !ctr.IsRunning() {
+	if !ctr.State.IsRunning() {
 		return nil, errNotRunning(ctr.ID)
 	}
-	if ctr.IsPaused() {
+	if ctr.State.IsPaused() {
 		return nil, errExecPaused(name)
 	}
-	if ctr.IsRestarting() {
+	if ctr.State.IsRestarting() {
 		return nil, errContainerIsRestarting(ctr.ID)
 	}
 	return ctr, nil
diff --git a/daemon/export.go b/daemon/export.go
index 1f4607c102..dcd84bd75c 100644
--- a/daemon/export.go
+++ b/daemon/export.go
@@ -26,12 +26,12 @@ func (daemon *Daemon) ContainerExport(ctx context.Context, name string, out io.W
 		return errors.New("the daemon on this operating system does not support exporting Windows containers")
 	}
 
-	if ctr.IsDead() {
+	if ctr.State.IsDead() {
 		err := fmt.Errorf("You cannot export container %s which is Dead", ctr.ID)
 		return errdefs.Conflict(err)
 	}
 
-	if ctr.IsRemovalInProgress() {
+	if ctr.State.IsRemovalInProgress() {
 		err := fmt.Errorf("You cannot export container %s which is being removed", ctr.ID)
 		return errdefs.Conflict(err)
 	}
diff --git a/daemon/health.go b/daemon/health.go
index 59774d973d..c427c7021a 100644
--- a/daemon/health.go
+++ b/daemon/health.go
@@ -264,7 +264,7 @@ func monitor(d *Daemon, c *container.Container, stop chan struct{}, probe probe)
 			return probeInterval
 		}
 		c.Lock()
-		status := c.Health.Health.Status
+		status := c.State.Health.Health.Status
 		c.Unlock()
 
 		if status == containertypes.Starting {
@@ -351,11 +351,11 @@ func (daemon *Daemon) updateHealthMonitor(c *container.Container) {
 		return // No healthcheck configured
 	}
 
-	probe := getProbe(c)
-	wantRunning := c.Running && !c.Paused && probe != nil
+	healthProbe := getProbe(c)
+	wantRunning := c.State.Running && !c.State.Paused && healthProbe != nil
 	if wantRunning {
 		if stop := h.OpenMonitorChannel(); stop != nil {
-			go monitor(daemon, c, stop, probe)
+			go monitor(daemon, c, stop, healthProbe)
 		}
 	} else {
 		h.CloseMonitorChannel()
diff --git a/daemon/images/image_delete.go b/daemon/images/image_delete.go
index cc62450035..ec04e88f49 100644
--- a/daemon/images/image_delete.go
+++ b/daemon/images/image_delete.go
@@ -384,7 +384,7 @@ func (i *ImageService) checkImageDeleteConflict(imgID image.ID, mask conflictTyp
 	if mask&conflictRunningContainer != 0 {
 		// Check if any running container is using the image.
 		running := func(c *container.Container) bool {
-			return c.ImageID == imgID && c.IsRunning()
+			return c.ImageID == imgID && c.State.IsRunning()
 		}
 		if ctr := i.containers.First(running); ctr != nil {
 			return &imageDeleteConflict{
@@ -407,7 +407,7 @@ func (i *ImageService) checkImageDeleteConflict(imgID image.ID, mask conflictTyp
 	if mask&conflictStoppedContainer != 0 {
 		// Check if any stopped containers reference this image.
 		stopped := func(c *container.Container) bool {
-			return !c.IsRunning() && c.ImageID == imgID
+			return !c.State.IsRunning() && c.ImageID == imgID
 		}
 		if ctr := i.containers.First(stopped); ctr != nil {
 			return &imageDeleteConflict{
diff --git a/daemon/inspect.go b/daemon/inspect.go
index c17f825d4c..693c0670a1 100644
--- a/daemon/inspect.go
+++ b/daemon/inspect.go
@@ -162,7 +162,7 @@ func (daemon *Daemon) getInspectData(daemonCfg *config.Config, ctr *container.Co
 	}
 
 	if ctr.RWLayer == nil {
-		if ctr.Dead {
+		if ctr.State.Dead {
 			return inspectResponse, nil
 		}
 		return nil, errdefs.System(errors.New("RWLayer of container " + ctr.ID + " is unexpectedly nil"))
@@ -170,7 +170,7 @@ func (daemon *Daemon) getInspectData(daemonCfg *config.Config, ctr *container.Co
 
 	graphDriverData, err := ctr.RWLayer.Metadata()
 	if err != nil {
-		if ctr.Dead {
+		if ctr.State.Dead {
 			// container is marked as Dead, and its graphDriver metadata may
 			// have been removed; we can ignore errors.
 			return inspectResponse, nil
diff --git a/daemon/inspect_test.go b/daemon/inspect_test.go
index 16b00a1f8d..188b76278a 100644
--- a/daemon/inspect_test.go
+++ b/daemon/inspect_test.go
@@ -29,7 +29,7 @@ func TestGetInspectData(t *testing.T) {
 	_, err := d.getInspectData(&cfg.Config, c)
 	assert.Check(t, is.ErrorContains(err, "RWLayer of container inspect-me is unexpectedly nil"))
 
-	c.Dead = true
+	c.State.Dead = true
 	_, err = d.getInspectData(&cfg.Config, c)
 	assert.Check(t, err)
 }
diff --git a/daemon/kill.go b/daemon/kill.go
index 091a894346..cad91cd91f 100644
--- a/daemon/kill.go
+++ b/daemon/kill.go
@@ -84,11 +84,11 @@ func (daemon *Daemon) killWithSignal(container *containerpkg.Container, stopSign
 		}
 		if containerStopSignal == stopSignal {
 			container.ExitOnNext()
-			unpause = container.Paused
+			unpause = container.State.Paused
 		}
 	} else {
 		container.ExitOnNext()
-		unpause = container.Paused
+		unpause = container.State.Paused
 	}
 
 	if !daemon.IsShuttingDown() {
@@ -104,7 +104,7 @@ func (daemon *Daemon) killWithSignal(container *containerpkg.Container, stopSign
 	// if the container is currently restarting we do not need to send the signal
 	// to the process. Telling the monitor that it should exit on its next event
 	// loop is enough
-	if container.Restarting {
+	if container.State.Restarting {
 		return nil
 	}
 
@@ -124,7 +124,7 @@ func (daemon *Daemon) killWithSignal(container *containerpkg.Container, stopSign
 				// But this prevents race conditions in processing the container.
 				ctx, cancel := context.WithTimeout(context.TODO(), time.Duration(container.StopTimeout())*time.Second)
 				defer cancel()
-				s := <-container.Wait(ctx, containertypes.WaitConditionNotRunning)
+				s := <-container.State.Wait(ctx, containertypes.WaitConditionNotRunning)
 				if s.Err() != nil {
 					if err := daemon.handleContainerExit(container, nil); err != nil {
 						log.G(context.TODO()).WithFields(log.Fields{
@@ -159,7 +159,7 @@ func (daemon *Daemon) killWithSignal(container *containerpkg.Container, stopSign
 
 // Kill forcefully terminates a container.
 func (daemon *Daemon) Kill(container *containerpkg.Container) error {
-	if !container.IsRunning() {
+	if !container.State.IsRunning() {
 		return errNotRunning(container.ID)
 	}
 
@@ -179,7 +179,7 @@ func (daemon *Daemon) Kill(container *containerpkg.Container) error {
 	ctx, cancel := context.WithTimeout(context.Background(), waitTimeout)
 	defer cancel()
 
-	status := <-container.Wait(ctx, containertypes.WaitConditionNotRunning)
+	status := <-container.State.Wait(ctx, containertypes.WaitConditionNotRunning)
 	if status.Err() == nil {
 		return nil
 	}
@@ -197,7 +197,7 @@ func (daemon *Daemon) Kill(container *containerpkg.Container) error {
 	ctx2, cancel2 := context.WithTimeout(context.Background(), 2*time.Second)
 	defer cancel2()
 
-	if status := <-container.Wait(ctx2, containertypes.WaitConditionNotRunning); status.Err() != nil {
+	if status := <-container.State.Wait(ctx2, containertypes.WaitConditionNotRunning); status.Err() != nil {
 		return errors.New("tried to kill container, but did not receive an exit event")
 	}
 	return nil
@@ -207,7 +207,7 @@ func (daemon *Daemon) Kill(container *containerpkg.Container) error {
 func (daemon *Daemon) killPossiblyDeadProcess(container *containerpkg.Container, sig syscall.Signal) error {
 	err := daemon.killWithSignal(container, sig)
 	if cerrdefs.IsNotFound(err) {
-		err = errNoSuchProcess{container.GetPID(), sig}
+		err = errNoSuchProcess{container.State.GetPID(), sig}
 		log.G(context.TODO()).Debug(err)
 		return err
 	}
diff --git a/daemon/list_test.go b/daemon/list_test.go
index 3717a3acc7..7a39aa0adf 100644
--- a/daemon/list_test.go
+++ b/daemon/list_test.go
@@ -51,7 +51,7 @@ func setupContainerWithName(t *testing.T, name string, daemon *Daemon) *containe
 		name = "/" + name
 	}
 	c.Name = name
-	c.Running = true
+	c.State.Running = true
 	c.HostConfig = &containertypes.HostConfig{}
 	c.Created = time.Now()
 
diff --git a/daemon/logs.go b/daemon/logs.go
index fef89a2d09..fa5d9c639f 100644
--- a/daemon/logs.go
+++ b/daemon/logs.go
@@ -45,7 +45,7 @@ func (daemon *Daemon) ContainerLogs(ctx context.Context, containerName string, c
 		return nil, false, err
 	}
 
-	if ctr.RemovalInProgress || ctr.Dead {
+	if ctr.State.RemovalInProgress || ctr.State.Dead {
 		return nil, false, errdefs.Conflict(errors.New("can not get logs from container which is dead or marked for removal"))
 	}
 
diff --git a/daemon/monitor.go b/daemon/monitor.go
index 791ec98c5f..91ee2b0469 100644
--- a/daemon/monitor.go
+++ b/daemon/monitor.go
@@ -19,7 +19,7 @@ import (
 )
 
 func (daemon *Daemon) setStateCounter(c *container.Container) {
-	switch c.StateString() {
+	switch c.State.StateString() {
 	case "paused":
 		metrics.StateCtr.Set(c.ID, "paused")
 	case "running":
@@ -42,7 +42,7 @@ func (daemon *Daemon) handleContainerExit(c *container.Container, e *libcontaine
 	// c.ErrorMsg is set by [daemon.containerStart], and doesn't preserve the
 	// error type (because this field is persisted on disk). So, use string
 	// matching instead of usual error comparison methods.
-	if strings.Contains(c.ErrorMsg, errSetupNetworking) {
+	if strings.Contains(c.State.ErrorMsg, errSetupNetworking) {
 		c.Unlock()
 		return nil
 	}
@@ -53,7 +53,7 @@ func (daemon *Daemon) handleContainerExit(c *container.Container, e *libcontaine
 	// container is started again.
 	daemon.stopHealthchecks(c)
 
-	tsk, ok := c.Task()
+	tsk, ok := c.State.Task()
 	if ok {
 		ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
 		es, err := tsk.Delete(ctx)
@@ -81,12 +81,12 @@ func (daemon *Daemon) handleContainerExit(c *container.Container, e *libcontaine
 		ctrExitStatus.ExitCode = int(e.ExitCode)
 		ctrExitStatus.ExitedAt = e.ExitedAt
 		if e.Error != nil {
-			c.SetError(e.Error)
+			c.State.SetError(e.Error)
 		}
 	}
 
 	daemonShutdown := daemon.IsShuttingDown()
-	execDuration := time.Since(c.StartedAt)
+	execDuration := time.Since(c.State.StartedAt)
 	restart, wait, err := c.RestartManager().ShouldRestart(uint32(ctrExitStatus.ExitCode), daemonShutdown || c.HasBeenManuallyStopped, execDuration)
 	if err != nil {
 		log.G(ctx).WithFields(log.Fields{
@@ -115,9 +115,9 @@ func (daemon *Daemon) handleContainerExit(c *container.Container, e *libcontaine
 			"exitStatus":    ctrExitStatus,
 			"manualRestart": c.HasBeenManuallyRestarted,
 		}).Debug("Restarting container")
-		c.SetRestarting(&ctrExitStatus)
+		c.State.SetRestarting(&ctrExitStatus)
 	} else {
-		c.SetStopped(&ctrExitStatus)
+		c.State.SetStopped(&ctrExitStatus)
 		if !c.HasBeenManuallyRestarted {
 			defer daemon.autoRemove(&cfg.Config, c)
 		}
@@ -148,7 +148,7 @@ func (daemon *Daemon) handleContainerExit(c *container.Container, e *libcontaine
 			}
 			if waitErr != nil {
 				c.Lock()
-				c.SetStopped(&ctrExitStatus)
+				c.State.SetStopped(&ctrExitStatus)
 				daemon.setStateCounter(c)
 				c.CheckpointTo(context.TODO(), daemon.containersReplica)
 				c.Unlock()
@@ -179,7 +179,7 @@ func (daemon *Daemon) ProcessEvent(id string, e libcontainerdtypes.EventType, ei
 
 		c.Lock()
 		defer c.Unlock()
-		c.OOMKilled = true
+		c.State.OOMKilled = true
 		daemon.updateHealthMonitor(c)
 		if err := c.CheckpointTo(context.TODO(), daemon.containersReplica); err != nil {
 			return err
@@ -247,7 +247,7 @@ func (daemon *Daemon) ProcessEvent(id string, e libcontainerdtypes.EventType, ei
 		defer c.Unlock()
 
 		// This is here to handle start not generated by docker
-		if !c.Running {
+		if !c.State.Running {
 			ctr, err := daemon.containerd.LoadContainer(context.Background(), c.ID)
 			if err != nil {
 				if cerrdefs.IsNotFound(err) {
@@ -272,7 +272,7 @@ func (daemon *Daemon) ProcessEvent(id string, e libcontainerdtypes.EventType, ei
 				}
 				return err
 			}
-			c.SetRunningExternal(ctr, tsk)
+			c.State.SetRunningExternal(ctr, tsk)
 			c.HasBeenManuallyStopped = false
 			c.HasBeenStartedBefore = true
 			daemon.setStateCounter(c)
@@ -290,8 +290,8 @@ func (daemon *Daemon) ProcessEvent(id string, e libcontainerdtypes.EventType, ei
 		c.Lock()
 		defer c.Unlock()
 
-		if !c.Paused {
-			c.Paused = true
+		if !c.State.Paused {
+			c.State.Paused = true
 			daemon.setStateCounter(c)
 			daemon.updateHealthMonitor(c)
 			if err := c.CheckpointTo(context.TODO(), daemon.containersReplica); err != nil {
@@ -304,8 +304,8 @@ func (daemon *Daemon) ProcessEvent(id string, e libcontainerdtypes.EventType, ei
 		c.Lock()
 		defer c.Unlock()
 
-		if c.Paused {
-			c.Paused = false
+		if c.State.Paused {
+			c.State.Paused = false
 			daemon.setStateCounter(c)
 			daemon.updateHealthMonitor(c)
 
diff --git a/daemon/mounts.go b/daemon/mounts.go
index 8c86868dc9..b08eb2bca9 100644
--- a/daemon/mounts.go
+++ b/daemon/mounts.go
@@ -12,7 +12,7 @@ import (
 )
 
 func (daemon *Daemon) prepareMountPoints(container *container.Container) error {
-	alive := container.IsRunning()
+	alive := container.State.IsRunning()
 	for _, config := range container.MountPoints {
 		if err := daemon.lazyInitializeVolume(container.ID, config); err != nil {
 			return err
diff --git a/daemon/pause.go b/daemon/pause.go
index fe64f5093d..db65f80530 100644
--- a/daemon/pause.go
+++ b/daemon/pause.go
@@ -31,12 +31,12 @@ func (daemon *Daemon) containerPause(container *container.Container) error {
 	}
 
 	// We cannot Pause the container which is already paused
-	if container.Paused {
+	if container.State.Paused {
 		return errNotPaused(container.ID)
 	}
 
 	// We cannot Pause the container which is restarting
-	if container.Restarting {
+	if container.State.Restarting {
 		return errContainerIsRestarting(container.ID)
 	}
 
@@ -44,7 +44,7 @@ func (daemon *Daemon) containerPause(container *container.Container) error {
 		return fmt.Errorf("cannot pause container %s: %s", container.ID, err)
 	}
 
-	container.Paused = true
+	container.State.Paused = true
 	daemon.setStateCounter(container)
 	daemon.updateHealthMonitor(container)
 	daemon.LogContainerEvent(container, events.ActionPause)
diff --git a/daemon/prune.go b/daemon/prune.go
index dd7bb620c6..e0655c780c 100644
--- a/daemon/prune.go
+++ b/daemon/prune.go
@@ -61,7 +61,7 @@ func (daemon *Daemon) ContainersPrune(ctx context.Context, pruneFilters filters.
 		default:
 		}
 
-		if !c.IsRunning() {
+		if !c.State.IsRunning() {
 			if !until.IsZero() && c.Created.After(until) {
 				continue
 			}
diff --git a/daemon/rename.go b/daemon/rename.go
index 9576214537..b724fb698f 100644
--- a/daemon/rename.go
+++ b/daemon/rename.go
@@ -82,7 +82,7 @@ func (daemon *Daemon) ContainerRename(oldName, newName string) (retErr error) {
 		return err
 	}
 
-	if !ctr.Running {
+	if !ctr.State.Running {
 		daemon.LogContainerEventWithAttributes(ctr, events.ActionRename, map[string]string{
 			"oldName": oldName,
 		})
diff --git a/daemon/restart.go b/daemon/restart.go
index 55e07f277e..4038cd8226 100644
--- a/daemon/restart.go
+++ b/daemon/restart.go
@@ -55,7 +55,7 @@ func (daemon *Daemon) containerRestart(ctx context.Context, daemonCfg *configSto
 		}
 	}
 
-	if container.IsRunning() {
+	if container.State.IsRunning() {
 		container.Lock()
 		container.HasBeenManuallyRestarted = true
 		container.Unlock()
diff --git a/daemon/start.go b/daemon/start.go
index a1b4f7c3de..cf220f7ef8 100644
--- a/daemon/start.go
+++ b/daemon/start.go
@@ -29,9 +29,9 @@ func validateState(ctr *container.Container) error {
 	// Intentionally checking paused first, because a container can be
 	// BOTH running AND paused. To start a paused (but running) container,
 	// it must be thawed ("un-paused").
-	if ctr.Paused {
+	if ctr.State.Paused {
 		return errdefs.Conflict(errors.New("cannot start a paused container, try unpause instead"))
-	} else if ctr.Running {
+	} else if ctr.State.Running {
 		// This is not an actual error, but produces a 304 "not modified"
 		// when returned through the API to indicates the container is
 		// already in the desired state. It's implemented as an error
@@ -39,7 +39,7 @@ func validateState(ctr *container.Container) error {
 		// no further processing is needed).
 		return errdefs.NotModified(errors.New("container is already running"))
 	}
-	if ctr.RemovalInProgress || ctr.Dead {
+	if ctr.State.RemovalInProgress || ctr.State.Dead {
 		return errdefs.Conflict(errors.New("container is marked for removal and cannot be started"))
 	}
 	return nil
@@ -88,11 +88,11 @@ func (daemon *Daemon) containerStart(ctx context.Context, daemonCfg *configStore
 	container.Lock()
 	defer container.Unlock()
 
-	if resetRestartManager && container.Running { // skip this check if already in restarting step and resetRestartManager==false
+	if resetRestartManager && container.State.Running { // skip this check if already in restarting step and resetRestartManager==false
 		return nil
 	}
 
-	if container.RemovalInProgress || container.Dead {
+	if container.State.RemovalInProgress || container.State.Dead {
 		return errdefs.Conflict(errors.New("container is marked for removal and cannot be started"))
 	}
 
@@ -105,10 +105,10 @@ func (daemon *Daemon) containerStart(ctx context.Context, daemonCfg *configStore
 	// setup has been cleaned up properly
 	defer func() {
 		if retErr != nil {
-			container.SetError(retErr)
+			container.State.SetError(retErr)
 			// if no one else has set it, make sure we don't leave it at zero
-			if container.ExitCode() == 0 {
-				container.SetExitCode(exitUnknown)
+			if container.State.ExitCode() == 0 {
+				container.State.SetExitCode(exitUnknown)
 			}
 			if err := container.CheckpointTo(context.WithoutCancel(ctx), daemon.containersReplica); err != nil {
 				log.G(ctx).Errorf("%s: failed saving state on start failure: %v", container.ID, err)
@@ -211,7 +211,7 @@ func (daemon *Daemon) containerStart(ctx context.Context, daemonCfg *configStore
 		return nil
 	})
 	if err != nil {
-		return setExitCodeFromError(container.SetExitCode, err)
+		return setExitCodeFromError(container.State.SetExitCode, err)
 	}
 	defer func() {
 		if retErr != nil {
@@ -228,7 +228,7 @@ func (daemon *Daemon) containerStart(ctx context.Context, daemonCfg *configStore
 		checkpointDir, container.StreamConfig.Stdin() != nil || container.Config.Tty,
 		container.InitializeStdio)
 	if err != nil {
-		return setExitCodeFromError(container.SetExitCode, err)
+		return setExitCodeFromError(container.State.SetExitCode, err)
 	}
 	defer func() {
 		if retErr != nil {
@@ -244,11 +244,11 @@ func (daemon *Daemon) containerStart(ctx context.Context, daemonCfg *configStore
 	}
 
 	if err := tsk.Start(context.WithoutCancel(ctx)); err != nil { // passing a cancelable ctx caused integration tests to be stuck in the cleanup phase
-		return setExitCodeFromError(container.SetExitCode, err)
+		return setExitCodeFromError(container.State.SetExitCode, err)
 	}
 
 	container.HasBeenManuallyRestarted = false
-	container.SetRunning(ctr, tsk, startupTime)
+	container.State.SetRunning(ctr, tsk, startupTime)
 	container.HasBeenStartedBefore = true
 	daemon.setStateCounter(container)
 
@@ -270,7 +270,7 @@ func (daemon *Daemon) containerStart(ctx context.Context, daemonCfg *configStore
 func (daemon *Daemon) Cleanup(ctx context.Context, container *container.Container) {
 	// Microsoft HCS containers get in a bad state if host resources are
 	// released while the container still exists.
-	if ctr, ok := container.C8dContainer(); ok {
+	if ctr, ok := container.State.C8dContainer(); ok {
 		if err := ctr.Delete(context.Background()); err != nil {
 			log.G(ctx).Errorf("%s cleanup: failed to delete container from containerd: %v", container.ID, err)
 		}
diff --git a/daemon/start_unix.go b/daemon/start_unix.go
index ba839094ef..45c715463a 100644
--- a/daemon/start_unix.go
+++ b/daemon/start_unix.go
@@ -18,7 +18,7 @@ func (daemon *Daemon) getLibcontainerdCreateOptions(daemonCfg *configStore, cont
 
 	shim, opts, err := daemonCfg.Runtimes.Get(container.HostConfig.Runtime)
 	if err != nil {
-		return "", nil, setExitCodeFromError(container.SetExitCode, err)
+		return "", nil, setExitCodeFromError(container.State.SetExitCode, err)
 	}
 
 	return shim, opts, nil
diff --git a/daemon/stats.go b/daemon/stats.go
index ba4426ca7e..d231c20ec6 100644
--- a/daemon/stats.go
+++ b/daemon/stats.go
@@ -28,7 +28,7 @@ func (daemon *Daemon) ContainerStats(ctx context.Context, prefixOrName string, c
 	}
 
 	// If the container is either not running or restarting and requires no stream, return an empty stats.
-	if !config.Stream && (!ctr.IsRunning() || ctr.IsRestarting()) {
+	if !config.Stream && (!ctr.State.IsRunning() || ctr.State.IsRestarting()) {
 		return json.NewEncoder(config.OutStream()).Encode(&containertypes.StatsResponse{
 			Name: ctr.Name,
 			ID:   ctr.ID,
diff --git a/daemon/stop.go b/daemon/stop.go
index 1523e9dc19..ab2e3e6545 100644
--- a/daemon/stop.go
+++ b/daemon/stop.go
@@ -27,7 +27,7 @@ func (daemon *Daemon) ContainerStop(ctx context.Context, name string, options ba
 	if err != nil {
 		return err
 	}
-	if !ctr.IsRunning() {
+	if !ctr.State.IsRunning() {
 		// This is not an actual error, but produces a 304 "not modified"
 		// when returned through the API to indicates the container is
 		// already in the desired state. It's implemented as an error
@@ -49,7 +49,7 @@ func (daemon *Daemon) containerStop(ctx context.Context, ctr *container.Containe
 	// Cancelling the request should not cancel the stop.
 	ctx = context.WithoutCancel(ctx)
 
-	if !ctr.IsRunning() {
+	if !ctr.State.IsRunning() {
 		return nil
 	}
 
@@ -96,7 +96,7 @@ func (daemon *Daemon) containerStop(ctx context.Context, ctr *container.Containe
 	}
 	defer cancel()
 
-	if status := <-ctr.Wait(subCtx, containertypes.WaitConditionNotRunning); status.Err() == nil {
+	if status := <-ctr.State.Wait(subCtx, containertypes.WaitConditionNotRunning); status.Err() == nil {
 		// container did exit, so ignore any previous errors and return
 		return nil
 	}
@@ -118,7 +118,7 @@ func (daemon *Daemon) containerStop(ctx context.Context, ctr *container.Containe
 		// got a kill error, but give container 2 more seconds to exit just in case
 		subCtx, cancel := context.WithTimeout(ctx, 2*time.Second)
 		defer cancel()
-		status := <-ctr.Wait(subCtx, containertypes.WaitConditionNotRunning)
+		status := <-ctr.State.Wait(subCtx, containertypes.WaitConditionNotRunning)
 		if status.Err() != nil {
 			log.G(ctx).WithError(err).WithField("container", ctr.ID).Errorf("error killing container: %v", status.Err())
 			return err
diff --git a/daemon/top_unix.go b/daemon/top_unix.go
index 6748515ba9..8fcb48b62a 100644
--- a/daemon/top_unix.go
+++ b/daemon/top_unix.go
@@ -159,7 +159,7 @@ func (daemon *Daemon) ContainerTop(name string, psArgs string) (*container.TopRe
 		if err != nil {
 			return nil, err
 		}
-		if ctr.Restarting {
+		if ctr.State.Restarting {
 			return nil, errContainerIsRestarting(ctr.ID)
 		}
 		return tsk, nil
diff --git a/daemon/top_windows.go b/daemon/top_windows.go
index 6f178231be..3bdab52921 100644
--- a/daemon/top_windows.go
+++ b/daemon/top_windows.go
@@ -45,7 +45,7 @@ func (daemon *Daemon) ContainerTop(name string, psArgs string) (*container.TopRe
 		if err != nil {
 			return nil, err
 		}
-		if ctr.Restarting {
+		if ctr.State.Restarting {
 			return nil, errContainerIsRestarting(ctr.ID)
 		}
 		return task, nil
diff --git a/daemon/unpause.go b/daemon/unpause.go
index ca0fbeea0b..f752461650 100644
--- a/daemon/unpause.go
+++ b/daemon/unpause.go
@@ -24,7 +24,7 @@ func (daemon *Daemon) containerUnpause(ctr *container.Container) error {
 	defer ctr.Unlock()
 
 	// We cannot unpause the container which is not paused
-	if !ctr.Paused {
+	if !ctr.State.Paused {
 		return fmt.Errorf("Container %s is not paused", ctr.ID)
 	}
 	tsk, err := ctr.GetRunningTask()
@@ -36,7 +36,7 @@ func (daemon *Daemon) containerUnpause(ctr *container.Container) error {
 		return fmt.Errorf("Cannot unpause container %s: %s", ctr.ID, err)
 	}
 
-	ctr.Paused = false
+	ctr.State.Paused = false
 	daemon.setStateCounter(ctr)
 	daemon.updateHealthMonitor(ctr)
 	daemon.LogContainerEvent(ctr, events.ActionUnPause)
diff --git a/daemon/update.go b/daemon/update.go
index 3fec1087f4..6510f6ac82 100644
--- a/daemon/update.go
+++ b/daemon/update.go
@@ -43,7 +43,7 @@ func (daemon *Daemon) update(name string, hostConfig *container.HostConfig) erro
 	defer func() {
 		if restoreConfig {
 			ctr.Lock()
-			if !ctr.RemovalInProgress && !ctr.Dead {
+			if !ctr.State.RemovalInProgress && !ctr.State.Dead {
 				ctr.HostConfig = &backupHostConfig
 				ctr.CheckpointTo(context.WithoutCancel(context.TODO()), daemon.containersReplica)
 			}
@@ -53,7 +53,7 @@ func (daemon *Daemon) update(name string, hostConfig *container.HostConfig) erro
 
 	ctr.Lock()
 
-	if ctr.RemovalInProgress || ctr.Dead {
+	if ctr.State.RemovalInProgress || ctr.State.Dead {
 		ctr.Unlock()
 		return errCannotUpdate(ctr.ID, errors.New(`container is marked for removal and cannot be "update"`))
 	}
@@ -83,7 +83,7 @@ func (daemon *Daemon) update(name string, hostConfig *container.HostConfig) erro
 	// If container is running (including paused), we need to update configs
 	// to the real world.
 	ctr.Lock()
-	isRestarting := ctr.Restarting
+	isRestarting := ctr.State.Restarting
 	tsk, err := ctr.GetRunningTask()
 	ctr.Unlock()
 	if cerrdefs.IsConflict(err) || isRestarting {
diff --git a/daemon/wait.go b/daemon/wait.go
index ec8181cec0..a1118091a0 100644
--- a/daemon/wait.go
+++ b/daemon/wait.go
@@ -20,5 +20,5 @@ func (daemon *Daemon) ContainerWait(ctx context.Context, name string, condition
 		return nil, err
 	}
 
-	return cntr.Wait(ctx, condition), nil
+	return cntr.State.Wait(ctx, condition), nil
 }
diff --git a/integration/container/daemon_linux_test.go b/integration/container/daemon_linux_test.go
index 2de8eb2198..d08b27025c 100644
--- a/integration/container/daemon_linux_test.go
+++ b/integration/container/daemon_linux_test.go
@@ -208,7 +208,7 @@ func TestRestartDaemonWithRestartingContainer(t *testing.T) {
 	d.Stop(t)
 
 	d.TamperWithContainerConfig(t, id, func(c *realcontainer.Container) {
-		c.SetRestarting(&realcontainer.ExitStatus{ExitCode: 1})
+		c.State.SetRestarting(&realcontainer.ExitStatus{ExitCode: 1})
 		c.HasBeenStartedBefore = true
 	})
 
@@ -256,7 +256,7 @@ func TestHardRestartWhenContainerIsRunning(t *testing.T) {
 
 	for _, id := range []string{noPolicy, onFailure} {
 		d.TamperWithContainerConfig(t, id, func(c *realcontainer.Container) {
-			c.SetRunning(nil, nil, time.Now())
+			c.State.SetRunning(nil, nil, time.Now())
 			c.HasBeenStartedBefore = true
 		})
 	}