diff --git a/doc/source/user/index.rst b/doc/source/user/index.rst
index ad40060fc8..b534a2f9bf 100644
--- a/doc/source/user/index.rst
+++ b/doc/source/user/index.rst
@@ -1209,7 +1209,7 @@ _`heat_container_agent_tag`
   This label allows users to select `a specific heat_container_agent
   version, based on its container tag
   <https://hub.docker.com/r/openstackmagnum/heat-container-agent/tags/>`_.
-  Stein-default: stein-dev
+  Train-default: train-dev
 
 _`kube_dashboard_enabled`
   This label triggers the deployment of the kubernetes dashboard.
diff --git a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml
index 4082c1a305..7d98b8bbff 100644
--- a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml
+++ b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml
@@ -554,7 +554,7 @@ parameters:
   heat_container_agent_tag:
     type: string
     description: tag of the heat_container_agent system container
-    default: stein-dev
+    default: train-dev
 
   keystone_auth_enabled:
     type: boolean
diff --git a/playbooks/container-builder-vars.yaml b/playbooks/container-builder-vars.yaml
index 2582636aca..5ac0b8f715 100644
--- a/playbooks/container-builder-vars.yaml
+++ b/playbooks/container-builder-vars.yaml
@@ -15,6 +15,6 @@ kubernetes_images:
 
 magnum_images:
   - name: heat-container-agent
-    tag: stein-dev
+    tag: train-dev
 
 helm_version: v2.12.3
diff --git a/releasenotes/notes/heat-container-agent-for-train-e63bc1559750fe9c.yaml b/releasenotes/notes/heat-container-agent-for-train-e63bc1559750fe9c.yaml
new file mode 100644
index 0000000000..d6467ea361
--- /dev/null
+++ b/releasenotes/notes/heat-container-agent-for-train-e63bc1559750fe9c.yaml
@@ -0,0 +1,4 @@
+---
+other:
+  - |
+    Now the heat-container-agent default tag for Train release is train-dev.