diff --git a/barbican/values_overrides/train-ubuntu_bionic.yaml b/barbican/values_overrides/train-ubuntu_bionic.yaml
new file mode 100644
index 0000000000..9aff2205e6
--- /dev/null
+++ b/barbican/values_overrides/train-ubuntu_bionic.yaml
@@ -0,0 +1,12 @@
+---
+images:
+  tags:
+    bootstrap: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
+    scripted_test: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
+    db_init: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
+    barbican_db_sync: "docker.io/openstackhelm/barbican:train-ubuntu_bionic"
+    db_drop: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
+    ks_user: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
+    ks_service: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
+    ks_endpoints: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
+    barbican_api: "docker.io/openstackhelm/barbican:train-ubuntu_bionic"
diff --git a/cinder/values_overrides/train-ubuntu_bionic.yaml b/cinder/values_overrides/train-ubuntu_bionic.yaml
new file mode 100644
index 0000000000..14e4527e52
--- /dev/null
+++ b/cinder/values_overrides/train-ubuntu_bionic.yaml
@@ -0,0 +1,17 @@
+---
+images:
+  tags:
+    db_init: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
+    cinder_db_sync: "docker.io/openstackhelm/cinder:train-ubuntu_bionic"
+    db_drop: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
+    ks_user: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
+    ks_service: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
+    ks_endpoints: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
+    cinder_api: "docker.io/openstackhelm/cinder:train-ubuntu_bionic"
+    bootstrap: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
+    cinder_scheduler: "docker.io/openstackhelm/cinder:train-ubuntu_bionic"
+    cinder_volume: "docker.io/openstackhelm/cinder:train-ubuntu_bionic"
+    cinder_volume_usage_audit: "docker.io/openstackhelm/cinder:train-ubuntu_bionic"
+    cinder_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_bionic"
+    cinder_backup: "docker.io/openstackhelm/cinder:train-ubuntu_bionic"
+    cinder_backup_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_bionic"
diff --git a/glance/values_overrides/train-ubuntu_bionic.yaml b/glance/values_overrides/train-ubuntu_bionic.yaml
new file mode 100644
index 0000000000..39c549a8fd
--- /dev/null
+++ b/glance/values_overrides/train-ubuntu_bionic.yaml
@@ -0,0 +1,14 @@
+---
+images:
+  tags:
+    bootstrap: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
+    db_init: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
+    db_drop: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
+    ks_user: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
+    ks_service: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
+    ks_endpoints: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
+    glance_db_sync: "docker.io/openstackhelm/glance:train-ubuntu_bionic"
+    glance_api: "docker.io/openstackhelm/glance:train-ubuntu_bionic"
+    glance_registry: "docker.io/openstackhelm/glance:train-ubuntu_bionic"
+    glance_metadefs_load: "docker.io/openstackhelm/glance:train-ubuntu_bionic"
+    glance_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_bionic"
diff --git a/heat/values_overrides/train-ubuntu_bionic.yaml b/heat/values_overrides/train-ubuntu_bionic.yaml
new file mode 100644
index 0000000000..917ce96f0c
--- /dev/null
+++ b/heat/values_overrides/train-ubuntu_bionic.yaml
@@ -0,0 +1,16 @@
+---
+images:
+  tags:
+    bootstrap: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
+    db_init: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
+    db_drop: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
+    ks_user: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
+    ks_service: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
+    ks_endpoints: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
+    heat_db_sync: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
+    heat_api: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
+    heat_cfn: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
+    heat_cloudwatch: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
+    heat_engine: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
+    heat_engine_cleaner: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
+    heat_purge_deleted: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
diff --git a/horizon/values_overrides/train-ubuntu_bionic.yaml b/horizon/values_overrides/train-ubuntu_bionic.yaml
new file mode 100644
index 0000000000..2b3fe442c4
--- /dev/null
+++ b/horizon/values_overrides/train-ubuntu_bionic.yaml
@@ -0,0 +1,7 @@
+---
+images:
+  tags:
+    db_init: docker.io/openstackhelm/heat:train-ubuntu_bionic
+    db_drop: docker.io/openstackhelm/heat:train-ubuntu_bionic
+    horizon_db_sync: docker.io/openstackhelm/horizon:train-ubuntu_bionic
+    horizon: docker.io/openstackhelm/horizon:train-ubuntu_bionic
diff --git a/keystone/values_overrides/train-ubuntu_bionic.yaml b/keystone/values_overrides/train-ubuntu_bionic.yaml
new file mode 100644
index 0000000000..e5528f559f
--- /dev/null
+++ b/keystone/values_overrides/train-ubuntu_bionic.yaml
@@ -0,0 +1,15 @@
+---
+images:
+  tags:
+    bootstrap: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
+    db_init: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
+    db_drop: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
+    keystone_api: "docker.io/openstackhelm/keystone:train-ubuntu_bionic"
+    keystone_bootstrap: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
+    keystone_credential_rotate: "docker.io/openstackhelm/keystone:train-ubuntu_bionic"
+    keystone_credential_setup: "docker.io/openstackhelm/keystone:train-ubuntu_bionic"
+    keystone_db_sync: "docker.io/openstackhelm/keystone:train-ubuntu_bionic"
+    keystone_domain_manage: "docker.io/openstackhelm/keystone:train-ubuntu_bionic"
+    keystone_fernet_rotate: "docker.io/openstackhelm/keystone:train-ubuntu_bionic"
+    keystone_fernet_setup: "docker.io/openstackhelm/keystone:train-ubuntu_bionic"
+    ks_user: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
diff --git a/neutron/values_overrides/train-ubuntu_bionic.yaml b/neutron/values_overrides/train-ubuntu_bionic.yaml
new file mode 100644
index 0000000000..28e728f17b
--- /dev/null
+++ b/neutron/values_overrides/train-ubuntu_bionic.yaml
@@ -0,0 +1,18 @@
+---
+images:
+  tags:
+    bootstrap: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
+    db_init: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
+    db_drop: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
+    ks_user: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
+    ks_service: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
+    ks_endpoints: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
+    neutron_db_sync: "docker.io/openstackhelm/neutron:train-ubuntu_bionic"
+    neutron_dhcp: "docker.io/openstackhelm/neutron:train-ubuntu_bionic"
+    neutron_l3: "docker.io/openstackhelm/neutron:train-ubuntu_bionic"
+    neutron_l2gw: "docker.io/openstackhelm/neutron:train-ubuntu_bionic"
+    neutron_linuxbridge_agent: "docker.io/openstackhelm/neutron:train-ubuntu_bionic"
+    neutron_metadata: "docker.io/openstackhelm/neutron:train-ubuntu_bionic"
+    neutron_openvswitch_agent: "docker.io/openstackhelm/neutron:train-ubuntu_bionic"
+    neutron_server: "docker.io/openstackhelm/neutron:train-ubuntu_bionic"
+    neutron_bagpipe_bgp: "docker.io/openstackhelm/neutron:train-ubuntu_bionic"
diff --git a/nova/templates/bin/_nova-placement-api.sh.tpl b/nova/templates/bin/_nova-placement-api.sh.tpl
index bc15a37d41..913e2a2b68 100644
--- a/nova/templates/bin/_nova-placement-api.sh.tpl
+++ b/nova/templates/bin/_nova-placement-api.sh.tpl
@@ -24,13 +24,13 @@ function start () {
   cp -a $(type -p nova-placement-api) /var/www/cgi-bin/nova/
 
   if [ -f /etc/apache2/envvars ]; then
-     # Loading Apache2 ENV variables
-     source /etc/apache2/envvars
-     # The directory below has to be created due to the fact that
-     # libapache2-mod-wsgi-py3 doesn't create it in contrary by libapache2-mod-wsgi
-     if [ ! -d ${APACHE_RUN_DIR} ]; then
-        mkdir -p ${APACHE_RUN_DIR}
-     fi
+    # Loading Apache2 ENV variables
+    source /etc/apache2/envvars
+    # The directory below has to be created due to the fact that
+    # libapache2-mod-wsgi-py3 doesn't create it in contrary by libapache2-mod-wsgi
+    if [ ! -d ${APACHE_RUN_DIR} ]; then
+      mkdir -p ${APACHE_RUN_DIR}
+    fi
   fi
 
   # Start Apache2
diff --git a/nova/values_overrides/train-ubuntu_bionic.yaml b/nova/values_overrides/train-ubuntu_bionic.yaml
new file mode 100644
index 0000000000..f943d0e96f
--- /dev/null
+++ b/nova/values_overrides/train-ubuntu_bionic.yaml
@@ -0,0 +1,32 @@
+---
+images:
+  tags:
+    bootstrap: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
+    db_drop: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
+    db_init: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
+    ks_user: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
+    ks_service: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
+    ks_endpoints: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
+    nova_api: "docker.io/openstackhelm/nova:train-ubuntu_bionic"
+    nova_cell_setup: "docker.io/openstackhelm/nova:train-ubuntu_bionic"
+    nova_cell_setup_init: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
+    nova_compute: "docker.io/openstackhelm/nova:train-ubuntu_bionic"
+    nova_compute_ssh: "docker.io/openstackhelm/nova:train-ubuntu_bionic"
+    nova_conductor: "docker.io/openstackhelm/nova:train-ubuntu_bionic"
+    nova_db_sync: "docker.io/openstackhelm/nova:train-ubuntu_bionic"
+    nova_novncproxy: "docker.io/openstackhelm/nova:train-ubuntu_bionic"
+    nova_novncproxy_assets: "docker.io/openstackhelm/nova:train-ubuntu_bionic"
+    nova_placement: "docker.io/openstackhelm/placement:master-ubuntu_bionic-20200207"
+    nova_scheduler: "docker.io/openstackhelm/nova:train-ubuntu_bionic"
+    nova_spiceproxy: "docker.io/openstackhelm/nova:train-ubuntu_bionic"
+    nova_spiceproxy_assets: "docker.io/openstackhelm/nova:train-ubuntu_bionic"
+    nova_service_cleaner: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_bionic"
+manifests:
+  # NOTE(lamt): The nova-consoleauth service has been removed. It was
+  # deprecated since the 18.0.0 (Rocky) release.
+  # See: https://docs.openstack.org/releasenotes/nova/train.html
+  deployment_consoleauth: false
+  # NOTE(lamt): Placement code was extracted from nova post Stein.
+  # A placement chart will need to be deployed to replace.
+  # See: https://docs.openstack.org/releasenotes/nova/train.html
+  deployment_placement: false
diff --git a/placement/values_overrides/train-ubuntu_bionic.yaml b/placement/values_overrides/train-ubuntu_bionic.yaml
new file mode 100644
index 0000000000..990b1cf8d1
--- /dev/null
+++ b/placement/values_overrides/train-ubuntu_bionic.yaml
@@ -0,0 +1,12 @@
+images:
+  pull_policy: IfNotPresent
+  tags:
+    placement: "docker.io/openstackhelm/placement:master-ubuntu_bionic"
+    ks_user: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
+    ks_service: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
+    ks_endpoints: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
+    db_init: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
+    db_drop: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
+    placement_db_sync: "docker.io/openstackhelm/placement:master-ubuntu_bionic"
+    dep_check: "quay.io/airshipit/kubernetes-entrypoint:v1.0.0"
+    image_repo_sync: "docker.io/docker:17.07.0"
diff --git a/zuul.d/jobs-openstack-helm.yaml b/zuul.d/jobs-openstack-helm.yaml
index 849c1fc1fe..c17b7d8171 100644
--- a/zuul.d/jobs-openstack-helm.yaml
+++ b/zuul.d/jobs-openstack-helm.yaml
@@ -142,6 +142,16 @@
         openstack_release: ocata
         container_distro_name: ubuntu
         container_distro_version: xenial
+
+- job:
+    name: openstack-helm-cinder-train-ubuntu_bionic
+    parent: openstack-helm-cinder
+    vars:
+      osh_params:
+        openstack_release: train
+        container_distro_name: ubuntu
+        container_distro_version: bionic
+
 - job:
     name: openstack-helm-compute-kit
     parent: openstack-helm-chart-deploy
@@ -216,6 +226,16 @@
         openstack_release: ocata
         container_distro_name: ubuntu
         container_distro_version: xenial
+
+- job:
+    name: openstack-helm-compute-kit-train-ubuntu_bionic
+    parent: openstack-helm-compute-kit
+    vars:
+      osh_params:
+        openstack_release: train
+        container_distro_name: ubuntu
+        container_distro_version: bionic
+
 - job:
     name: openstack-helm-horizon
     parent: openstack-helm-chart-deploy
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 845ac02b59..e45871c715 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -33,6 +33,7 @@
         - openstack-helm-cinder-rocky-ubuntu_bionic
         - openstack-helm-cinder-rocky-opensuse_15:
             voting: false
+        - openstack-helm-cinder-train-ubuntu_bionic
         - openstack-helm-compute-kit
         - openstack-helm-compute-kit-ocata-ubuntu_xenial
         - openstack-helm-compute-kit-pike-ubuntu_xenial
@@ -41,6 +42,7 @@
         - openstack-helm-compute-kit-rocky-ubuntu_bionic
         - openstack-helm-compute-kit-rocky-opensuse_15:
             voting: false
+        - openstack-helm-compute-kit-train-ubuntu_bionic
         - openstack-helm-horizon
         - openstack-helm-apparmor:
             voting: false