diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2
index e6ddc94a88..1a37ca7112 100644
--- a/common/deploy-steps.j2
+++ b/common/deploy-steps.j2
@@ -90,7 +90,7 @@ parameters:
     description: Whether containerized puppet executions use modules from the baremetal host. Defaults to true. Can be set to false to consume puppet modules from containers directly.
   FastForwardUpgradeReleases:
     type: comma_delimited_list
-    default: ['ocata', 'pike', 'queens']
+    default: ['rocky', 'stein', 'train']
     description: List of releases to fast forward through during upgrade. Last release in list is used for post steps.
   ContainerLogStdoutPath:
     type: string
diff --git a/deployment/aodh/aodh-api-container-puppet.yaml b/deployment/aodh/aodh-api-container-puppet.yaml
index 65473053f6..3a584e4348 100644
--- a/deployment/aodh/aodh-api-container-puppet.yaml
+++ b/deployment/aodh/aodh-api-container-puppet.yaml
@@ -251,7 +251,7 @@ outputs:
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
           block:
             - name: Check for aodh running under apache
               tags: common
@@ -276,7 +276,7 @@ outputs:
           service: name=httpd state=stopped enabled=no
           when:
             - step|int == 1
-            - release == 'ocata'
+            - release == 'rocky'
             - aodh_httpd_enabled|bool
             - httpd_running|bool
         - name: Aodh package update
diff --git a/deployment/aodh/aodh-evaluator-container-puppet.yaml b/deployment/aodh/aodh-evaluator-container-puppet.yaml
index 34b201e9fe..f4cb753908 100644
--- a/deployment/aodh/aodh-evaluator-container-puppet.yaml
+++ b/deployment/aodh/aodh-evaluator-container-puppet.yaml
@@ -141,7 +141,7 @@ outputs:
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
           block:
             - name: FFU check if openstack-aodh-evaluator is deployed
               command: systemctl is-enabled --quiet openstack-aodh-evaluator
@@ -154,5 +154,5 @@ outputs:
           service: name=openstack-aodh-evaluator state=stopped enabled=no
           when:
             - step|int == 1
-            - release == 'ocata'
+            - release == 'rocky'
             - aodh_evaluator_enabled|bool
diff --git a/deployment/aodh/aodh-listener-container-puppet.yaml b/deployment/aodh/aodh-listener-container-puppet.yaml
index 04b3950354..c93fa25575 100644
--- a/deployment/aodh/aodh-listener-container-puppet.yaml
+++ b/deployment/aodh/aodh-listener-container-puppet.yaml
@@ -141,7 +141,7 @@ outputs:
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
           block:
             - name: FFU check if openstack-aodh-listener is deployed
               command: systemctl is-enabled --quiet openstack-aodh-listener
@@ -154,5 +154,5 @@ outputs:
           service: name=openstack-aodh-listener state=stopped enabled=no
           when:
             - step|int == 1
-            - release == 'ocata'
+            - release == 'rocky'
             - aodh_listener_enabled|bool
diff --git a/deployment/aodh/aodh-notifier-container-puppet.yaml b/deployment/aodh/aodh-notifier-container-puppet.yaml
index 19c9866e88..b88b87ea5d 100644
--- a/deployment/aodh/aodh-notifier-container-puppet.yaml
+++ b/deployment/aodh/aodh-notifier-container-puppet.yaml
@@ -141,7 +141,7 @@ outputs:
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
           block:
             - name: FFU check if openstack-aodh-notifier is deployed
               command: systemctl is-enabled --quiet openstack-aodh-notifier
@@ -154,5 +154,5 @@ outputs:
           service: name=openstack-aodh-notifier state=stopped enabled=no
           when:
             - step|int == 1
-            - release == 'ocata'
+            - release == 'rocky'
             - aodh_notifier_enabled|bool
diff --git a/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml
index 672e22a656..822caf7eed 100644
--- a/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml
+++ b/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml
@@ -188,7 +188,7 @@ outputs:
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
           block:
             - name: FFU check if openstack-ceilometer-central is deployed
               command: systemctl is-enabled --quiet openstack-ceilometer-central
@@ -201,5 +201,5 @@ outputs:
           service: name=openstack-ceilometer-central state=stopped enabled=no
           when:
             - step|int == 1
-            - release == 'ocata'
+            - release == 'rocky'
             - ceilometer_agent_central_enabled|bool
diff --git a/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml
index 5707332651..a03902dc25 100644
--- a/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml
+++ b/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml
@@ -136,7 +136,7 @@ outputs:
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
           block:
             - name: FFU check if openstack-ceilometer-compute is deployed
               command: systemctl is-enabled openstack-ceilometer-compute
@@ -148,6 +148,6 @@ outputs:
         - name: FFU stop and disable openstack-ceilometer-compute service
           when:
             - step|int == 1
-            - release == 'ocata'
+            - release == 'rocky'
             - ceilometer_agent_compute_enabled|bool
           service: name=openstack-ceilometer-compute state=stopped enabled=no
diff --git a/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml
index 12a94d1fb0..56282c4819 100644
--- a/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml
+++ b/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml
@@ -149,7 +149,7 @@ outputs:
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
           block:
             - name: FFU check if openstack-ceilometer-ipmi is enabled
               command: systemctl is-enabled openstack-ceilometer-ipmi
@@ -161,6 +161,6 @@ outputs:
         - name: FFU stop and disable openstack-ceilometer-ipmi service
           when:
             - step|int == 1
-            - release == 'ocata'
+            - release == 'rocky'
             - ceilometer_ipmi_enabled|bool
           service: name=openstack-ceilometer-ipmi state=stopped enabled=no
diff --git a/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml
index 0e34833834..bebfeb17fb 100644
--- a/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml
+++ b/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml
@@ -175,7 +175,7 @@ outputs:
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
           block:
             - name: FFU check if openstack-ceilometer-notification is deployed
               command: systemctl is-enabled openstack-ceilometer-notification
@@ -187,6 +187,6 @@ outputs:
         - name: FFU stop and diable openstack-ceilometer-notification service
           when:
             - step|int == 1
-            - release == 'ocata'
+            - release == 'rocky'
             - ceilometer_agent_notification_enabled|bool
           service: name=openstack-ceilometer-notification state=stopped enabled=no
diff --git a/deployment/cinder/cinder-api-container-puppet.yaml b/deployment/cinder/cinder-api-container-puppet.yaml
index 2b1cd216d9..17e9880913 100644
--- a/deployment/cinder/cinder-api-container-puppet.yaml
+++ b/deployment/cinder/cinder-api-container-puppet.yaml
@@ -378,7 +378,7 @@ outputs:
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
           block:
             - name: Check is cinder_api is deployed
               command: systemctl is-enabled --quiet openstack-cinder-api
@@ -391,7 +391,7 @@ outputs:
           service: name=openstack-cinder-api state=stopped
           when:
             - step|int == 1
-            - release == 'ocata'
+            - release == 'rocky'
             - cinder_api_enabled|bool
         - name: Extra removal of services for cinder
           shell: |
@@ -401,13 +401,13 @@ outputs:
             while read i ; do cinder-manage service remove $i ; done
           when:
             - step|int == 5
-            - release == 'pike'
+            - release == 'stein'
             - is_bootstrap_node|bool
         - name: Extra migration for cinder
           command: cinder-manage db online_data_migrations
           when:
             - step|int == 5
-            - release == 'pike'
+            - release == 'stein'
             - is_bootstrap_node|bool
         - name: Cinder package update
           package:
diff --git a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml b/deployment/cinder/cinder-backup-pacemaker-puppet.yaml
index 63642cb1ee..9a5e51028a 100644
--- a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml
+++ b/deployment/cinder/cinder-backup-pacemaker-puppet.yaml
@@ -409,7 +409,7 @@ outputs:
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
             - is_bootstrap_node|bool
           block:
             - name: Check cluster resource status
@@ -432,6 +432,6 @@ outputs:
           until: cinder_backup_output.rc == 0
           when:
             - step|int == 2
-            - release == 'ocata'
+            - release == 'rocky'
             - is_bootstrap_node|bool
             - cinder_backup_res|bool
diff --git a/deployment/cinder/cinder-scheduler-container-puppet.yaml b/deployment/cinder/cinder-scheduler-container-puppet.yaml
index cb36a57692..abdbfc8939 100644
--- a/deployment/cinder/cinder-scheduler-container-puppet.yaml
+++ b/deployment/cinder/cinder-scheduler-container-puppet.yaml
@@ -167,7 +167,7 @@ outputs:
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
           block:
             - name: Check if cinder_scheduler is deployed
               command: systemctl is-enabled --quiet openstack-cinder-scheduler
@@ -180,5 +180,5 @@ outputs:
           service: name=openstack-cinder-scheduler state=stopped enabled=no
           when:
             - step|int == 1
-            - release == 'ocata'
+            - release == 'rocky'
             - cinder_scheduler_enabled|bool
diff --git a/deployment/cinder/cinder-volume-container-puppet.yaml b/deployment/cinder/cinder-volume-container-puppet.yaml
index 0a05894923..b42f24b863 100644
--- a/deployment/cinder/cinder-volume-container-puppet.yaml
+++ b/deployment/cinder/cinder-volume-container-puppet.yaml
@@ -336,7 +336,7 @@ outputs:
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
           block:
             - name: Check if cinder_volume is deployed
               command: systemctl is-enabled --quiet openstack-cinder-volume
@@ -349,5 +349,5 @@ outputs:
           service: name=openstack-cinder-volume state=stopped enabled=no
           when:
             - step|int == 1
-            - release == 'ocata'
+            - release == 'rocky'
             - cinder_volume_enabled|bool
diff --git a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml b/deployment/cinder/cinder-volume-pacemaker-puppet.yaml
index 2761bb558d..4dd5c9c826 100644
--- a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml
+++ b/deployment/cinder/cinder-volume-pacemaker-puppet.yaml
@@ -402,7 +402,7 @@ outputs:
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
             - is_bootstrap_node|bool
           block:
             - name: Check cluster resource status
@@ -425,6 +425,6 @@ outputs:
           until: cinder_volume_output.rc == 0
           when:
             - step|int == 2
-            - release == 'ocata'
+            - release == 'rocky'
             - is_bootstrap_node|bool
             - cinder_volume_res|bool
diff --git a/deployment/database/mysql-container-puppet.yaml b/deployment/database/mysql-container-puppet.yaml
index a00b7adbf3..b20e93a3fe 100644
--- a/deployment/database/mysql-container-puppet.yaml
+++ b/deployment/database/mysql-container-puppet.yaml
@@ -321,7 +321,7 @@ outputs:
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 6
-            - release == 'ocata'
+            - release == 'rocky'
             - is_bootstrap_node|bool
           block:
             - name: Remove whitespaces in .my.cnf
diff --git a/deployment/database/mysql-pacemaker-puppet.yaml b/deployment/database/mysql-pacemaker-puppet.yaml
index 573789609e..40623ce9f1 100644
--- a/deployment/database/mysql-pacemaker-puppet.yaml
+++ b/deployment/database/mysql-pacemaker-puppet.yaml
@@ -631,7 +631,7 @@ outputs:
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 6
-            - release == 'ocata'
+            - release == 'rocky'
             - is_bootstrap_node|bool
           block:
             - name: Remove whitespaces in .my.cnf
diff --git a/deployment/database/redis-pacemaker-puppet.yaml b/deployment/database/redis-pacemaker-puppet.yaml
index 3c1f81a36c..8ab29330a1 100644
--- a/deployment/database/redis-pacemaker-puppet.yaml
+++ b/deployment/database/redis-pacemaker-puppet.yaml
@@ -478,7 +478,7 @@ outputs:
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
             - is_bootstrap_node|bool
           block:
             - name: Check cluster resource status of redis
@@ -501,6 +501,6 @@ outputs:
           until: redis_output.rc == 0
           when:
             - step|int == 2
-            - release == 'ocata'
+            - release == 'rocky'
             - is_bootstrap_node|bool
             - redis_res|bool
diff --git a/deployment/glance/glance-api-container-puppet.yaml b/deployment/glance/glance-api-container-puppet.yaml
index 0c74fa9c39..68958b1654 100644
--- a/deployment/glance/glance-api-container-puppet.yaml
+++ b/deployment/glance/glance-api-container-puppet.yaml
@@ -615,7 +615,7 @@ outputs:
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
           block:
             - name: Check if glance_api is deployed
               command: systemctl is-enabled --quiet openstack-glance-api
@@ -628,7 +628,7 @@ outputs:
           service: name=openstack-glance-api state=stopped enabled=no
           when:
             - step|int == 1
-            - release == 'ocata'
+            - release == 'rocky'
             - glance_api_enabled|bool
         - name: glance package update
           package: name=openstack-glance state=latest
diff --git a/deployment/gnocchi/gnocchi-api-container-puppet.yaml b/deployment/gnocchi/gnocchi-api-container-puppet.yaml
index bb44b846bb..d06cfcdadd 100644
--- a/deployment/gnocchi/gnocchi-api-container-puppet.yaml
+++ b/deployment/gnocchi/gnocchi-api-container-puppet.yaml
@@ -385,7 +385,7 @@ outputs:
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
           block:
             - name: Check if httpd service is running
               command: systemctl is-active --quiet httpd
@@ -419,12 +419,12 @@ outputs:
           service: name=openstack-gnocchi-api state=stopped enabled=no
           when:
             - step|int == 1
-            - release == 'ocata'
+            - release == 'rocky'
             - gnocchi_api_enabled|bool
         - name: Stop and disable httpd service
           when:
             - step|int == 1
-            - release == 'ocata'
+            - release == 'rocky'
             - gnocchi_httpd_enabled|bool
             - httpd_running|bool
           service: name=httpd state=stopped enabled=no
diff --git a/deployment/gnocchi/gnocchi-metricd-container-puppet.yaml b/deployment/gnocchi/gnocchi-metricd-container-puppet.yaml
index ad8a131c15..f7deeae7f4 100644
--- a/deployment/gnocchi/gnocchi-metricd-container-puppet.yaml
+++ b/deployment/gnocchi/gnocchi-metricd-container-puppet.yaml
@@ -196,7 +196,7 @@ outputs:
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
           block:
             - name: FFU check if openstack-gnocchi-metricd is deployed
               command: systemctl is-enabled --quiet openstack-gnocchi-metricd
@@ -209,5 +209,5 @@ outputs:
           service: name=openstack-gnocchi-metricd state=stopped enabled=no
           when:
             - step|int == 1
-            - release == 'ocata'
+            - release == 'rocky'
             - gnocchi_metricd_enabled|bool
diff --git a/deployment/gnocchi/gnocchi-statsd-container-puppet.yaml b/deployment/gnocchi/gnocchi-statsd-container-puppet.yaml
index 19dc6c525a..6bf8abd1f0 100644
--- a/deployment/gnocchi/gnocchi-statsd-container-puppet.yaml
+++ b/deployment/gnocchi/gnocchi-statsd-container-puppet.yaml
@@ -194,16 +194,16 @@ outputs:
           register: gnocchi_statsd_enabled_result
           when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
         - name: Set fact gnocchi_statsd_enabled
           set_fact:
             gnocchi_statsd_enabled: "{{ gnocchi_statsd_enabled_result.rc == 0 }}"
           when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
         - name: FFU stop and disable openstack-gnocchi-statsd service
           service: name=openstack-gnocchi-statsd state=stopped enabled=no
           when:
             - step|int == 2
-            - release == 'ocata'
+            - release == 'rocky'
             - gnocchi_statsd_enabled|bool
diff --git a/deployment/heat/heat-api-cfn-container-puppet.yaml b/deployment/heat/heat-api-cfn-container-puppet.yaml
index 506e9ff320..db0e6bb4ef 100644
--- a/deployment/heat/heat-api-cfn-container-puppet.yaml
+++ b/deployment/heat/heat-api-cfn-container-puppet.yaml
@@ -232,7 +232,7 @@ outputs:
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
           block:
             - name: FFU check if openstack-heat-api-cfn service is enabled
               command: systemctl is-enabled openstack-heat-api-cfn
@@ -244,6 +244,6 @@ outputs:
         - name: FFU stop and disable openstack-heat-api-cfn service
           when:
             - step|int == 1
-            - release == 'ocata'
+            - release == 'rocky'
             - heat_api_cfn_enabled|bool
           service: name=openstack-heat-api-cfn state=stopped enabled=no
diff --git a/deployment/heat/heat-api-cloudwatch-disabled-puppet.yaml b/deployment/heat/heat-api-cloudwatch-disabled-puppet.yaml
index 3da21f5f72..4b4099f041 100644
--- a/deployment/heat/heat-api-cloudwatch-disabled-puppet.yaml
+++ b/deployment/heat/heat-api-cloudwatch-disabled-puppet.yaml
@@ -40,7 +40,7 @@ outputs:
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
           block:
             - name: FFU check if heat_api_cloudwatch is deployed
               command: systemctl is-enabled openstack-heat-api-cloudwatch
@@ -53,11 +53,11 @@ outputs:
           service: name=openstack-heat-api-cloudwatch state=stopped enabled=no
           when:
             - step|int == 1
-            - release == 'ocata'
+            - release == 'rocky'
             - heat_api_cloudwatch_enabled|bool
         - name: Remove heat_api_cloudwatch package
           package: name=openstack-heat-api-cloudwatch state=removed
           ignore_errors: True
           when:
             - step|int == 2
-            - release == 'ocata'
+            - release == 'rocky'
diff --git a/deployment/heat/heat-api-container-puppet.yaml b/deployment/heat/heat-api-container-puppet.yaml
index d5c58b3f3e..a542a7369c 100644
--- a/deployment/heat/heat-api-container-puppet.yaml
+++ b/deployment/heat/heat-api-container-puppet.yaml
@@ -281,7 +281,7 @@ outputs:
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
           block:
             - name: FFU check openstack-heat-api is enabled
               command: systemctl is-enabled openstack-heat-api
@@ -294,7 +294,7 @@ outputs:
           service: name=openstack-heat-api state=stopped enabled=no
           when:
             - step|int == 1
-            - release == 'ocata'
+            - release == 'rocky'
             - heat_api_enabled|bool
         - name: FFU Heat package update
           package:
diff --git a/deployment/heat/heat-engine-container-puppet.yaml b/deployment/heat/heat-engine-container-puppet.yaml
index d25f607834..c7b4127dcd 100644
--- a/deployment/heat/heat-engine-container-puppet.yaml
+++ b/deployment/heat/heat-engine-container-puppet.yaml
@@ -291,7 +291,7 @@ outputs:
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
           block:
             - name: FFU check if openstack-heat-engine is enabled
               command: systemctl is-enabled --quiet openstack-heat-engine
@@ -303,6 +303,6 @@ outputs:
         - name: FFU stop and disable openstack-heat-engine service
           when:
             - step|int == 1
-            - release == 'ocata'
+            - release == 'rocky'
             - heat_engine_enabled|bool
           service: name=openstack-heat-engine state=stopped enabled=no
diff --git a/deployment/ironic/ironic-api-container-puppet.yaml b/deployment/ironic/ironic-api-container-puppet.yaml
index dc8c6a87a6..8aab4fffd4 100644
--- a/deployment/ironic/ironic-api-container-puppet.yaml
+++ b/deployment/ironic/ironic-api-container-puppet.yaml
@@ -291,7 +291,7 @@ outputs:
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
           block:
             - name: Check if ironic_api is deployed
               command: systemctl is-enabled --quiet openstack-ironic-api
@@ -304,7 +304,7 @@ outputs:
           service: name=openstack-ironic-api state=stopped enabled=no
           when:
             - step|int == 1
-            - release == 'ocata'
+            - release == 'rocky'
             - ironic_api_enabled|bool
         - name: Ironic package update
           package:
@@ -323,4 +323,4 @@ outputs:
           when:
             - step|int == 8
             - is_bootstrap_node|bool
-            - release == 'pike'
+            - release == 'stein'
diff --git a/deployment/ironic/ironic-conductor-container-puppet.yaml b/deployment/ironic/ironic-conductor-container-puppet.yaml
index a9a92976c8..d4d4ac9a88 100644
--- a/deployment/ironic/ironic-conductor-container-puppet.yaml
+++ b/deployment/ironic/ironic-conductor-container-puppet.yaml
@@ -595,7 +595,7 @@ outputs:
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
           block:
             - name: Check if ironic_conductor is deployed
               command: systemctl is-enabled --quiet openstack-ironic-conductor
@@ -608,7 +608,7 @@ outputs:
           service: name=openstack-ironic-conductor state=stopped enabled=no
           when:
             - step|int == 1
-            - release == 'ocata'
+            - release == 'rocky'
             - ironic_conductor_enabled|bool
         - name: Ironic packages update
           package:
diff --git a/deployment/keystone/keystone-container-puppet.yaml b/deployment/keystone/keystone-container-puppet.yaml
index ae7f96041a..53b96c6160 100644
--- a/deployment/keystone/keystone-container-puppet.yaml
+++ b/deployment/keystone/keystone-container-puppet.yaml
@@ -672,7 +672,7 @@ outputs:
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
           block:
             - name: Check for keystone running under apache
               tags: common
@@ -697,7 +697,7 @@ outputs:
           service: name=httpd state=stopped enabled=no
           when:
             - step|int == 1
-            - release == 'ocata'
+            - release == 'rocky'
             - keystone_httpd_enabled|bool
             - httpd_running|bool
         - name: Keystone package update
diff --git a/deployment/manila/manila-api-container-puppet.yaml b/deployment/manila/manila-api-container-puppet.yaml
index e6e600bd2a..355568a8fb 100644
--- a/deployment/manila/manila-api-container-puppet.yaml
+++ b/deployment/manila/manila-api-container-puppet.yaml
@@ -259,18 +259,18 @@ outputs:
           register: manila_api_enabled_result
           when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
         - name: Set fact manila_api_enabled
           set_fact:
             manila_api_enabled: "{{ manila_api_enabled_result.rc == 0 }}"
           when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
         - name: Stop openstack-manila-api
           service: name=openstack-manila-api state=stopped
           when:
             - step|int == 1
-            - release == 'ocata'
+            - release == 'rocky'
             - manila_api_enabled|bool
         - name: manila package update
           package:
diff --git a/deployment/manila/manila-scheduler-container-puppet.yaml b/deployment/manila/manila-scheduler-container-puppet.yaml
index 645c02c179..db4ef9a767 100644
--- a/deployment/manila/manila-scheduler-container-puppet.yaml
+++ b/deployment/manila/manila-scheduler-container-puppet.yaml
@@ -131,16 +131,16 @@ outputs:
           register: manila_scheduler_enabled_result
           when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
         - name: Set fact manila_scheduler_enabled
           set_fact:
             manila_scheduler_enabled: "{{ manila_scheduler_enabled_result.rc == 0 }}"
           when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
         - name: Stop openstack-manila-scheduler
           service: name=openstack-manila-scheduler state=stopped enabled=no
           when:
             - step|int == 1
-            - release == 'ocata'
+            - release == 'rocky'
             - manila_scheduler_enabled|bool
diff --git a/deployment/manila/manila-share-container-puppet.yaml b/deployment/manila/manila-share-container-puppet.yaml
index 586fed21e8..87b9039592 100644
--- a/deployment/manila/manila-share-container-puppet.yaml
+++ b/deployment/manila/manila-share-container-puppet.yaml
@@ -186,16 +186,16 @@ outputs:
           register: manila_share_enabled_result
           when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
         - name: Set fact manila_share_enabled
           set_fact:
             manila_share_enabled: "{{ manila_share_enabled_result.rc == 0 }}"
           when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
         - name: Stop openstack-manila-share
           service: name=openstack-manila-share state=stopped enabled=no
           when:
             - step|int == 1
-            - release == 'ocata'
+            - release == 'rocky'
             - manila_share_enabled|bool
diff --git a/deployment/manila/manila-share-pacemaker-puppet.yaml b/deployment/manila/manila-share-pacemaker-puppet.yaml
index a04580ad0e..2f00f1fea9 100644
--- a/deployment/manila/manila-share-pacemaker-puppet.yaml
+++ b/deployment/manila/manila-share-pacemaker-puppet.yaml
@@ -404,14 +404,14 @@ outputs:
           register: manila_share_res_result
           when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
             - is_bootstrap_node|bool
         - name: Set fact manila_share_res
           set_fact:
             manila_share_res: "{{ manila_share_res_result.rc == 0 }}"
           when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
             - is_bootstrap_node|bool
         - name: Disable the openstack-manila-share cluster resource
           pacemaker_resource:
@@ -423,6 +423,6 @@ outputs:
           until: manila_share_output.rc == 0
           when:
             - step|int == 2
-            - release == 'ocata'
+            - release == 'rocky'
             - is_bootstrap_node|bool
             - manila_share_res|bool
diff --git a/deployment/memcached/memcached-container-puppet.yaml b/deployment/memcached/memcached-container-puppet.yaml
index d0bfe1e893..2cb0ccd85f 100644
--- a/deployment/memcached/memcached-container-puppet.yaml
+++ b/deployment/memcached/memcached-container-puppet.yaml
@@ -203,7 +203,7 @@ outputs:
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
           block:
             - name: Check if memcached is deployed
               command: systemctl is-enabled --quiet memcached
@@ -216,6 +216,6 @@ outputs:
         - name: Stop and disable memcached service
           when:
             - step|int == 2
-            - release == 'ocata'
+            - release == 'rocky'
             - memcached_enabled|bool
           service: name=memcached state=stopped enabled=no
diff --git a/deployment/metrics/collectd-container-puppet.yaml b/deployment/metrics/collectd-container-puppet.yaml
index aa790594ce..3c3950f34a 100644
--- a/deployment/metrics/collectd-container-puppet.yaml
+++ b/deployment/metrics/collectd-container-puppet.yaml
@@ -666,7 +666,7 @@ outputs:
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
           block:
             - name: Check if collectd.service is deployed
               command: systemctl is-enabled --quiet collectd.service
@@ -679,5 +679,5 @@ outputs:
           service: name=collectd.service state=stopped enabled=no
           when:
             - step|int == 1
-            - release == 'ocata'
+            - release == 'rocky'
             - collectd_enabled|bool
diff --git a/deployment/neutron/neutron-api-container-puppet.yaml b/deployment/neutron/neutron-api-container-puppet.yaml
index 3e86a8e54a..bd90c2a92f 100644
--- a/deployment/neutron/neutron-api-container-puppet.yaml
+++ b/deployment/neutron/neutron-api-container-puppet.yaml
@@ -528,7 +528,7 @@ outputs:
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
           block:
             - name: Check if neutron_server is deployed
               command: systemctl is-enabled --quiet neutron-server
@@ -541,7 +541,7 @@ outputs:
           service: name=neutron-server state=stopped enabled=no
           when:
             - step|int == 1
-            - release == 'ocata'
+            - release == 'rocky'
             - neutron_server_enabled|bool
         - when:
             - step|int == 6
diff --git a/deployment/neutron/neutron-dhcp-container-puppet.yaml b/deployment/neutron/neutron-dhcp-container-puppet.yaml
index 8ac750107b..207bdf6e49 100644
--- a/deployment/neutron/neutron-dhcp-container-puppet.yaml
+++ b/deployment/neutron/neutron-dhcp-container-puppet.yaml
@@ -432,7 +432,7 @@ outputs:
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
           block:
             - name: Check if neutron_dhcp_agent is deployed
               command: systemctl is-enabled --quiet neutron-dhcp-agent
@@ -445,7 +445,7 @@ outputs:
           service: name=neutron-dhcp-agent state=stopped enabled=no
           when:
             - step|int == 2
-            - release == 'ocata'
+            - release == 'rocky'
             - neutron_dhcp_agent_enabled|bool
       post_upgrade_tasks:
         - name: Check for neutron user
diff --git a/deployment/neutron/neutron-l3-container-puppet.yaml b/deployment/neutron/neutron-l3-container-puppet.yaml
index 051faf730b..52b65f22ba 100644
--- a/deployment/neutron/neutron-l3-container-puppet.yaml
+++ b/deployment/neutron/neutron-l3-container-puppet.yaml
@@ -394,7 +394,7 @@ outputs:
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
           block:
             - name: Check if neutron_l3_agent is deployed
               command: systemctl is-enabled --quiet neutron-l3-agent
@@ -407,7 +407,7 @@ outputs:
           service: name=neutron-l3-agent state=stopped enabled=no
           when:
             - step|int == 1
-            - release == 'ocata'
+            - release == 'rocky'
             - neutron_l3_agent_enabled|bool
       post_upgrade_tasks:
         - name: Check for neutron user
diff --git a/deployment/neutron/neutron-metadata-container-puppet.yaml b/deployment/neutron/neutron-metadata-container-puppet.yaml
index 9370917a84..a2ef52de88 100644
--- a/deployment/neutron/neutron-metadata-container-puppet.yaml
+++ b/deployment/neutron/neutron-metadata-container-puppet.yaml
@@ -213,7 +213,7 @@ outputs:
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
           block:
             - name: Check if neutron_metadata_agent is deployed
               command: systemctl is-enabled --quiet neutron-metadata-agent
@@ -226,5 +226,5 @@ outputs:
           service: name=neutron-metadata-agent state=stopped enabled=no
           when:
             - step|int == 1
-            - release == 'ocata'
+            - release == 'rocky'
             - neutron_metadata_agent_enabled|bool
diff --git a/deployment/neutron/neutron-ovs-agent-container-puppet.yaml b/deployment/neutron/neutron-ovs-agent-container-puppet.yaml
index 1c3ca27b84..78e286117d 100644
--- a/deployment/neutron/neutron-ovs-agent-container-puppet.yaml
+++ b/deployment/neutron/neutron-ovs-agent-container-puppet.yaml
@@ -385,7 +385,7 @@ outputs:
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
           block:
             - name: Check if neutron_ovs_agent is deployed
               command: systemctl is-enabled --quiet neutron-openvswitch-agent
@@ -398,5 +398,5 @@ outputs:
           service: name=neutron-openvswitch-agent state=stopped enabled=no
           when:
             - step|int == 1
-            - release == 'ocata'
+            - release == 'rocky'
             - neutron_ovs_agent_enabled|bool
diff --git a/deployment/nova/nova-api-container-puppet.yaml b/deployment/nova/nova-api-container-puppet.yaml
index 4acd9527b5..d97c2d9a29 100644
--- a/deployment/nova/nova-api-container-puppet.yaml
+++ b/deployment/nova/nova-api-container-puppet.yaml
@@ -508,7 +508,7 @@ outputs:
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
           block:
             - name: Check if nova-api is deployed
               command: systemctl is-enabled --quiet openstack-nova-api
@@ -522,12 +522,12 @@ outputs:
           when:
             - step|int == 1
             - nova_api_enabled|bool
-            - release == 'ocata'
+            - release == 'rocky'
         - name: Extra migration for nova tripleo/+bug/1656791
           command: nova-manage db online_data_migrations
           when:
             - step|int == 5
-            - release == 'ocata'
+            - release == 'rocky'
             - is_bootstrap_node|bool
         - name: Update nova packages
           package:
@@ -539,7 +539,7 @@ outputs:
         #FIXME(lyarwood): Use puppet to do this?
         - when:
             - step|int == 7
-            - release == 'ocata'
+            - release == 'rocky'
             - is_bootstrap_node|bool
           block:
             - name: Create puppet manifest to set transport_url in nova.conf
@@ -649,7 +649,7 @@ outputs:
               async: {get_param: NovaDbSyncTimeout}
               poll: 10
               when:
-                - release == 'pike'
+                - release == 'stein'
             - name: Sync nova_api DB
               command: nova-manage api_db sync
             - name: Online data migration for nova
diff --git a/deployment/nova/nova-compute-container-puppet.yaml b/deployment/nova/nova-compute-container-puppet.yaml
index 27964abee2..1699e78294 100644
--- a/deployment/nova/nova-compute-container-puppet.yaml
+++ b/deployment/nova/nova-compute-container-puppet.yaml
@@ -1138,7 +1138,7 @@ outputs:
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
           block:
             - name: Check if nova-compute is deployed
               command:  systemctl is-enabled --quiet openstack-nova-compute
@@ -1149,7 +1149,7 @@ outputs:
                 nova_compute_enabled: "{{ nova_compute_enabled_result.rc == 0 }}"
         - when:
             - step|int == 1
-            - release == 'ocata'
+            - release == 'rocky'
           block:
             - name: Stop and disable nova-compute service
               service: name=openstack-nova-compute state=stopped
diff --git a/deployment/nova/nova-conductor-container-puppet.yaml b/deployment/nova/nova-conductor-container-puppet.yaml
index d0d4cf80cc..166fd82550 100644
--- a/deployment/nova/nova-conductor-container-puppet.yaml
+++ b/deployment/nova/nova-conductor-container-puppet.yaml
@@ -237,7 +237,7 @@ outputs:
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
           block:
             - name: Check if nova_conductor is deployed
               command: systemctl is-enabled --quiet openstack-nova-conductor
@@ -250,5 +250,5 @@ outputs:
           service: name=openstack-nova-conductor state=stopped
           when:
             - step|int == 1
-            - release == 'ocata'
+            - release == 'rocky'
             - nova_conductor_enabled|bool
diff --git a/deployment/nova/nova-ironic-container-puppet.yaml b/deployment/nova/nova-ironic-container-puppet.yaml
index 6ec55da911..6ac33a6311 100644
--- a/deployment/nova/nova-ironic-container-puppet.yaml
+++ b/deployment/nova/nova-ironic-container-puppet.yaml
@@ -240,7 +240,7 @@ outputs:
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
           block:
             - name: Check if nova ironic is deployed
               command: systemctl is-enabled --quiet openstack-nova-compute
@@ -253,11 +253,11 @@ outputs:
           service: name=openstack-nova-compute state=stopped
           when:
             - step|int == 1
-            - release == 'ocata'
+            - release == 'rocky'
             - nova_ironic_enabled|bool
         - name: Set upgrade marker in nova statedir
           when:
             - step|int == 1
-            - release == 'ocata'
+            - release == 'rocky'
             - nova_ironic_enabled|bool
           file: path=/var/lib/nova/upgrade_marker state=touch owner=nova group=nova
diff --git a/deployment/nova/nova-scheduler-container-puppet.yaml b/deployment/nova/nova-scheduler-container-puppet.yaml
index 40562f817c..a92f1ff376 100644
--- a/deployment/nova/nova-scheduler-container-puppet.yaml
+++ b/deployment/nova/nova-scheduler-container-puppet.yaml
@@ -220,7 +220,7 @@ outputs:
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
           block:
             - name: Check if nova_scheduler is deployed
               command: systemctl is-enabled --quiet openstack-nova-scheduler
@@ -233,7 +233,7 @@ outputs:
           service: name=openstack-nova-scheduler state=stopped
           when:
             - step|int == 1
-            - release == 'ocata'
+            - release == 'rocky'
             - nova_scheduler_enabled|bool
       external_upgrade_tasks:
         - when:
diff --git a/deployment/nova/nova-vnc-proxy-container-puppet.yaml b/deployment/nova/nova-vnc-proxy-container-puppet.yaml
index dbba63941c..6d3a21220e 100644
--- a/deployment/nova/nova-vnc-proxy-container-puppet.yaml
+++ b/deployment/nova/nova-vnc-proxy-container-puppet.yaml
@@ -309,7 +309,7 @@ outputs:
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
           block:
             - name: Check if nova vncproxy is deployed
               command: systemctl is-enabled --quiet openstack-nova-novncproxy
@@ -322,7 +322,7 @@ outputs:
           service: name=openstack-nova-novncproxy state=stopped
           when:
             - step|int == 1
-            - release == 'ocata'
+            - release == 'rocky'
             - nova_vncproxy_enabled|bool
       external_upgrade_tasks:
         - when:
diff --git a/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml
index 731fa20078..ff7dbc4cd8 100644
--- a/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml
+++ b/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml
@@ -452,7 +452,7 @@ outputs:
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
             - is_bootstrap_node|bool
           block:
             - name: Check cluster resource status of rabbitmq
@@ -475,6 +475,6 @@ outputs:
           until: rabbitmq_output.rc == 0
           when:
             - step|int == 2
-            - release == 'ocata'
+            - release == 'rocky'
             - is_bootstrap_node|bool
             - rabbitmq_res|bool
diff --git a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml
index eb40202681..1cec2419c5 100644
--- a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml
+++ b/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml
@@ -439,7 +439,7 @@ outputs:
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
             - is_bootstrap_node|bool
           block:
             - name: Check cluster resource status of rabbitmq
@@ -462,6 +462,6 @@ outputs:
           until: rabbitmq_output.rc == 0
           when:
             - step|int == 2
-            - release == 'ocata'
+            - release == 'rocky'
             - is_bootstrap_node|bool
             - rabbitmq_res|bool
diff --git a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
index 8e6baee046..90a524930f 100644
--- a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
+++ b/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
@@ -458,7 +458,7 @@ outputs:
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
             - is_bootstrap_node|bool
           block:
             - name: Check cluster resource status of rabbitmq
@@ -481,6 +481,6 @@ outputs:
           until: rabbitmq_output.rc == 0
           when:
             - step|int == 2
-            - release == 'ocata'
+            - release == 'rocky'
             - is_bootstrap_node|bool
             - rabbitmq_res|bool
diff --git a/deployment/sahara/sahara-api-container-puppet.yaml b/deployment/sahara/sahara-api-container-puppet.yaml
index 8f27bbfd21..45d955c213 100644
--- a/deployment/sahara/sahara-api-container-puppet.yaml
+++ b/deployment/sahara/sahara-api-container-puppet.yaml
@@ -211,7 +211,7 @@ outputs:
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
           block:
             - name: FFU check openstack-sahara-api is enabled
               command: systemctl is-enabled openstack-sahara-api
@@ -224,7 +224,7 @@ outputs:
           service: name=openstack-sahara-api state=stopped enabled=no
           when:
             - step|int == 1
-            - release == 'ocata'
+            - release == 'rocky'
             - sahara_api_enabled|bool
         - name: FFU Sahara package update
           package:
diff --git a/deployment/sahara/sahara-engine-container-puppet.yaml b/deployment/sahara/sahara-engine-container-puppet.yaml
index 28995efaba..7ba525ddca 100644
--- a/deployment/sahara/sahara-engine-container-puppet.yaml
+++ b/deployment/sahara/sahara-engine-container-puppet.yaml
@@ -145,7 +145,7 @@ outputs:
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
           block:
             - name: FFU check if openstack-sahara-engine is enabled
               command: systemctl is-enabled --quiet openstack-sahara-engine
@@ -157,6 +157,6 @@ outputs:
         - name: FFU stop and disable openstack-sahara-engine service
           when:
             - step|int == 1
-            - release == 'ocata'
+            - release == 'rocky'
             - sahara_engine_enabled|bool
           service: name=openstack-sahara-engine state=stopped enabled=no
diff --git a/deployment/swift/swift-proxy-container-puppet.yaml b/deployment/swift/swift-proxy-container-puppet.yaml
index cc40277a25..79b13b9cb2 100644
--- a/deployment/swift/swift-proxy-container-puppet.yaml
+++ b/deployment/swift/swift-proxy-container-puppet.yaml
@@ -477,7 +477,7 @@ outputs:
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
           block:
             - name: Check if swift-proxy or swift-object-expirer are deployed
               command: systemctl is-enabled --quiet "{{ item }}"
@@ -494,5 +494,5 @@ outputs:
           with_items: "{{ swift_proxy_services_enabled.results }}"
           when:
             - step|int == 1
-            - release == 'ocata'
+            - release == 'rocky'
             - item.rc == 0
diff --git a/deployment/swift/swift-storage-container-puppet.yaml b/deployment/swift/swift-storage-container-puppet.yaml
index 8c5d062090..8430717d21 100644
--- a/deployment/swift/swift-storage-container-puppet.yaml
+++ b/deployment/swift/swift-storage-container-puppet.yaml
@@ -676,7 +676,7 @@ outputs:
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
           block:
             - name: Check if swift storage services are deployed
               command: systemctl is-enabled --quiet "{{ item }}"
@@ -705,5 +705,5 @@ outputs:
           with_items: "{{ swift_services_enabled.results }}"
           when:
             - step|int == 1
-            - release == 'ocata'
+            - release == 'rocky'
             - item.rc == 0
diff --git a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
index 3086641862..5f7d2170f2 100644
--- a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
+++ b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
@@ -40,7 +40,7 @@ parameters:
     constraints:
       - allowed_values: ['tripleo-repos', 'custom-script']
   FastForwardRepoArgs:
-    default: {'tripleo_repos': {'ocata': '-b ocata current', 'pike': '-b pike current', 'queens': '-b queens current'}}
+    default: {'tripleo_repos': {'rocky': '-b rocky current', 'stein': '-b stein current', 'train': '-b train current'}}
     type: json
   FastForwardCustomRepoScriptContent:
     default: |
@@ -48,7 +48,7 @@ parameters:
       set -e
       echo "If you use FastForwardRepoType 'custom-script' you have to provide the upgrade repo script content."
       echo "It will be installed as /root/ffu_upgrade_repo.sh on the node"
-      echo "and passed the upstream name (ocata, pike, queens) of the release as first argument"
+      echo "and passed the upstream name (rocky, stein, train) of the release as first argument"
       exit 1
     type: string
   UpgradeLeappEnabled: