diff --git a/nodeup/pkg/model/containerd.go b/nodeup/pkg/model/containerd.go
index 41f1176260..98b9894a38 100644
--- a/nodeup/pkg/model/containerd.go
+++ b/nodeup/pkg/model/containerd.go
@@ -249,8 +249,10 @@ func (b *ContainerdBuilder) buildSystemdServiceOverrideContainerOS(c *fi.ModelBu
 func (b *ContainerdBuilder) buildSystemdServiceOverrideFlatcar(c *fi.ModelBuilderContext) {
 	lines := []string{
 		"[Service]",
-		"Environment=CONTAINERD_CONFIG=" + b.containerdConfigFilePath(),
 		"EnvironmentFile=/etc/environment",
+		"Environment=CONTAINERD_CONFIG=" + b.containerdConfigFilePath(),
+		"ExecStart=",
+		"ExecStart=/usr/bin/env PATH=${TORCX_BINDIR}:${PATH} ${TORCX_BINDIR}/containerd --config ${CONTAINERD_CONFIG}",
 	}
 	contents := strings.Join(lines, "\n")
 
diff --git a/nodeup/pkg/model/tests/containerdbuilder/flatcar/tasks.yaml b/nodeup/pkg/model/tests/containerdbuilder/flatcar/tasks.yaml
index 8194d08359..10d4dfd491 100644
--- a/nodeup/pkg/model/tests/containerdbuilder/flatcar/tasks.yaml
+++ b/nodeup/pkg/model/tests/containerdbuilder/flatcar/tasks.yaml
@@ -46,8 +46,10 @@ afterFiles:
 - /etc/containerd/config-kops.toml
 contents: |-
   [Service]
-  Environment=CONTAINERD_CONFIG=/etc/containerd/config-kops.toml
   EnvironmentFile=/etc/environment
+  Environment=CONTAINERD_CONFIG=/etc/containerd/config-kops.toml
+  ExecStart=
+  ExecStart=/usr/bin/env PATH=${TORCX_BINDIR}:${PATH} ${TORCX_BINDIR}/containerd --config ${CONTAINERD_CONFIG}
 onChangeExecute:
 - - systemctl
   - daemon-reload