diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2
index bbd552eb27..d0afebd481 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 2617e8a786..2657518844 100644
--- a/deployment/aodh/aodh-api-container-puppet.yaml
+++ b/deployment/aodh/aodh-api-container-puppet.yaml
@@ -262,7 +262,7 @@ outputs:
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
           block:
             - name: Check for aodh running under apache
               tags: common
@@ -287,7 +287,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 65cf545394..d9c039a07c 100644
--- a/deployment/aodh/aodh-evaluator-container-puppet.yaml
+++ b/deployment/aodh/aodh-evaluator-container-puppet.yaml
@@ -133,7 +133,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
@@ -146,5 +146,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 2f3a07d25c..57891d89f7 100644
--- a/deployment/aodh/aodh-listener-container-puppet.yaml
+++ b/deployment/aodh/aodh-listener-container-puppet.yaml
@@ -133,7 +133,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
@@ -146,5 +146,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 131055e48d..52ccf7c878 100644
--- a/deployment/aodh/aodh-notifier-container-puppet.yaml
+++ b/deployment/aodh/aodh-notifier-container-puppet.yaml
@@ -134,7 +134,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
@@ -147,5 +147,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 22262014ae..92e2d06c16 100644
--- a/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml
+++ b/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml
@@ -191,7 +191,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
@@ -204,5 +204,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 cf901de199..1134613a87 100644
--- a/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml
+++ b/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml
@@ -128,7 +128,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
@@ -140,6 +140,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 9bfd60b125..823d6f1545 100644
--- a/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml
+++ b/deployment/ceilometer/ceilometer-agent-ipmi-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-ceilometer-ipmi is enabled
               command: systemctl is-enabled openstack-ceilometer-ipmi
@@ -153,6 +153,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 0ebcf2a6fc..d68599b533 100644
--- a/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml
+++ b/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml
@@ -148,7 +148,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
@@ -160,6 +160,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 548debe7a0..777bc8df71 100644
--- a/deployment/cinder/cinder-api-container-puppet.yaml
+++ b/deployment/cinder/cinder-api-container-puppet.yaml
@@ -397,7 +397,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
@@ -410,7 +410,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: |
@@ -420,13 +420,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 6b791f6846..4c34c25302 100644
--- a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml
+++ b/deployment/cinder/cinder-backup-pacemaker-puppet.yaml
@@ -407,7 +407,7 @@ outputs:
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
             - is_bootstrap_node|bool
           block:
             - name: Check cluster resource status
@@ -430,6 +430,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 1d0d038638..bd76259150 100644
--- a/deployment/cinder/cinder-scheduler-container-puppet.yaml
+++ b/deployment/cinder/cinder-scheduler-container-puppet.yaml
@@ -159,7 +159,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
@@ -172,5 +172,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 3dd7a69430..6437e853f3 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 48428a51a8..5bd767805b 100644
--- a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml
+++ b/deployment/cinder/cinder-volume-pacemaker-puppet.yaml
@@ -400,7 +400,7 @@ outputs:
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
             - is_bootstrap_node|bool
           block:
             - name: Check cluster resource status
@@ -423,6 +423,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 e738a091fd..4b0732e30e 100644
--- a/deployment/database/mysql-container-puppet.yaml
+++ b/deployment/database/mysql-container-puppet.yaml
@@ -309,7 +309,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 38acfa6081..d07f94fa78 100644
--- a/deployment/database/mysql-pacemaker-puppet.yaml
+++ b/deployment/database/mysql-pacemaker-puppet.yaml
@@ -622,7 +622,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 0d35c98a19..d1e3de5c01 100644
--- a/deployment/database/redis-pacemaker-puppet.yaml
+++ b/deployment/database/redis-pacemaker-puppet.yaml
@@ -468,7 +468,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
@@ -491,6 +491,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 613e5e7979..c3b8ab3348 100644
--- a/deployment/glance/glance-api-container-puppet.yaml
+++ b/deployment/glance/glance-api-container-puppet.yaml
@@ -635,7 +635,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
@@ -648,7 +648,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 d939b7b584..d9eabba64d 100644
--- a/deployment/gnocchi/gnocchi-api-container-puppet.yaml
+++ b/deployment/gnocchi/gnocchi-api-container-puppet.yaml
@@ -382,7 +382,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
@@ -416,12 +416,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 45651c1530..25cce2ae26 100644
--- a/deployment/gnocchi/gnocchi-metricd-container-puppet.yaml
+++ b/deployment/gnocchi/gnocchi-metricd-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-gnocchi-metricd is deployed
               command: systemctl is-enabled --quiet openstack-gnocchi-metricd
@@ -201,5 +201,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 95ded93929..2fd9e68443 100644
--- a/deployment/gnocchi/gnocchi-statsd-container-puppet.yaml
+++ b/deployment/gnocchi/gnocchi-statsd-container-puppet.yaml
@@ -184,16 +184,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 1f69de281d..8fda79da2b 100644
--- a/deployment/heat/heat-api-cfn-container-puppet.yaml
+++ b/deployment/heat/heat-api-cfn-container-puppet.yaml
@@ -234,7 +234,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
@@ -246,6 +246,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 529e13bfc5..b706a78ca9 100644
--- a/deployment/heat/heat-api-container-puppet.yaml
+++ b/deployment/heat/heat-api-container-puppet.yaml
@@ -295,7 +295,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
@@ -308,7 +308,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 ef9eb0d1fe..eaece0166f 100644
--- a/deployment/heat/heat-engine-container-puppet.yaml
+++ b/deployment/heat/heat-engine-container-puppet.yaml
@@ -308,7 +308,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
@@ -320,6 +320,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 dbb868924b..7b6d9ab950 100644
--- a/deployment/ironic/ironic-api-container-puppet.yaml
+++ b/deployment/ironic/ironic-api-container-puppet.yaml
@@ -288,7 +288,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
@@ -301,7 +301,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:
@@ -320,4 +320,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 aabdcd1de2..0f21772b07 100644
--- a/deployment/ironic/ironic-conductor-container-puppet.yaml
+++ b/deployment/ironic/ironic-conductor-container-puppet.yaml
@@ -587,7 +587,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
@@ -600,7 +600,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 c5b288d322..61461c5b3a 100644
--- a/deployment/keystone/keystone-container-puppet.yaml
+++ b/deployment/keystone/keystone-container-puppet.yaml
@@ -792,7 +792,7 @@ outputs:
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0
-            - release == 'ocata'
+            - release == 'rocky'
           block:
             - name: Check for keystone running under apache
               tags: common
@@ -817,7 +817,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 8d2c60f994..e9eb3a65c9 100644
--- a/deployment/manila/manila-api-container-puppet.yaml
+++ b/deployment/manila/manila-api-container-puppet.yaml
@@ -261,18 +261,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 5b134a550b..b2025bbd18 100644
--- a/deployment/manila/manila-scheduler-container-puppet.yaml
+++ b/deployment/manila/manila-scheduler-container-puppet.yaml
@@ -123,16 +123,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 6920214eea..490c2a0355 100644
--- a/deployment/manila/manila-share-container-puppet.yaml
+++ b/deployment/manila/manila-share-container-puppet.yaml
@@ -178,16 +178,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 fcce793b7d..05b1c6edce 100644
--- a/deployment/manila/manila-share-pacemaker-puppet.yaml
+++ b/deployment/manila/manila-share-pacemaker-puppet.yaml
@@ -394,14 +394,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:
@@ -413,6 +413,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 16482533e3..df39a2641d 100644
--- a/deployment/memcached/memcached-container-puppet.yaml
+++ b/deployment/memcached/memcached-container-puppet.yaml
@@ -189,7 +189,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
@@ -202,6 +202,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 6cb21b3f46..5b9eebeb07 100644
--- a/deployment/metrics/collectd-container-puppet.yaml
+++ b/deployment/metrics/collectd-container-puppet.yaml
@@ -685,7 +685,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
@@ -698,5 +698,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 20ce402152..6045eaba8e 100644
--- a/deployment/neutron/neutron-api-container-puppet.yaml
+++ b/deployment/neutron/neutron-api-container-puppet.yaml
@@ -548,7 +548,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
@@ -561,7 +561,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 06dc27c60d..8df02d7a4f 100644
--- a/deployment/neutron/neutron-dhcp-container-puppet.yaml
+++ b/deployment/neutron/neutron-dhcp-container-puppet.yaml
@@ -424,7 +424,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
@@ -437,7 +437,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 d3fb176ec3..027c93d72a 100644
--- a/deployment/neutron/neutron-l3-container-puppet.yaml
+++ b/deployment/neutron/neutron-l3-container-puppet.yaml
@@ -380,7 +380,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
@@ -393,7 +393,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 21d28b0720..542e0570ce 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 5beb6c0ac8..f5062350a6 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 b165749660..7ef439af90 100644
--- a/deployment/nova/nova-api-container-puppet.yaml
+++ b/deployment/nova/nova-api-container-puppet.yaml
@@ -514,7 +514,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
@@ -528,12 +528,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:
@@ -545,7 +545,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
@@ -655,7 +655,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 962bfe67ec..ed4f9f89c2 100644
--- a/deployment/nova/nova-compute-container-puppet.yaml
+++ b/deployment/nova/nova-compute-container-puppet.yaml
@@ -1147,7 +1147,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
@@ -1158,7 +1158,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 f15995eb29..38a8c566a1 100644
--- a/deployment/nova/nova-conductor-container-puppet.yaml
+++ b/deployment/nova/nova-conductor-container-puppet.yaml
@@ -218,7 +218,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
@@ -231,5 +231,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 67303e7422..18147a9d2f 100644
--- a/deployment/nova/nova-ironic-container-puppet.yaml
+++ b/deployment/nova/nova-ironic-container-puppet.yaml
@@ -232,7 +232,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
@@ -245,11 +245,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 6b7e3db7b7..1af334e712 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 b56fa5264d..7280a5f132 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 56730585f1..5f8208c11b 100644
--- a/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml
+++ b/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml
@@ -442,7 +442,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
@@ -465,6 +465,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 e2fd1a044e..562155fac4 100644
--- a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml
+++ b/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml
@@ -429,7 +429,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
@@ -452,6 +452,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 526efdc19d..b2001d05ec 100644
--- a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
+++ b/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
@@ -448,7 +448,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
@@ -471,6 +471,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 543397339a..4184fbc10d 100644
--- a/deployment/sahara/sahara-api-container-puppet.yaml
+++ b/deployment/sahara/sahara-api-container-puppet.yaml
@@ -207,7 +207,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
@@ -220,7 +220,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 86abf484f5..77243b49c4 100644
--- a/deployment/sahara/sahara-engine-container-puppet.yaml
+++ b/deployment/sahara/sahara-engine-container-puppet.yaml
@@ -137,7 +137,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
@@ -149,6 +149,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 ef7ad888a7..cb4515fe91 100644
--- a/deployment/swift/swift-proxy-container-puppet.yaml
+++ b/deployment/swift/swift-proxy-container-puppet.yaml
@@ -475,7 +475,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 }}"
@@ -492,5 +492,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 38e7f1b621..15168c68ea 100644
--- a/deployment/swift/swift-storage-container-puppet.yaml
+++ b/deployment/swift/swift-storage-container-puppet.yaml
@@ -667,7 +667,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 }}"
@@ -696,5 +696,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 da0e629772..dad8230e64 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: