diff --git a/definitions/scenarios/upgrade_to_capsule_6_14_z.rb b/definitions/scenarios/upgrade_to_capsule_6_15.rb
similarity index 83%
rename from definitions/scenarios/upgrade_to_capsule_6_14_z.rb
rename to definitions/scenarios/upgrade_to_capsule_6_15.rb
index 1e37c6798..e3590bcdf 100644
--- a/definitions/scenarios/upgrade_to_capsule_6_14_z.rb
+++ b/definitions/scenarios/upgrade_to_capsule_6_15.rb
@@ -1,4 +1,4 @@
-module Scenarios::Capsule_6_14_z
+module Scenarios::Capsule_6_15
   class Abstract < ForemanMaintain::Scenario
     def self.upgrade_metadata(&block)
       metadata do
@@ -6,20 +6,20 @@ def self.upgrade_metadata(&block)
         confine do
           feature(:capsule) &&
             (feature(:capsule).current_minor_version == '6.14' || \
-              ForemanMaintain.upgrade_in_progress == '6.14.z')
+            ForemanMaintain.upgrade_in_progress == '6.15')
         end
         instance_eval(&block)
       end
     end
 
     def target_version
-      '6.14.z'
+      '6.15'
     end
   end
 
   class PreUpgradeCheck < Abstract
     upgrade_metadata do
-      description 'Checks before upgrading to Capsule 6.14.z'
+      description 'Checks before upgrading to Capsule 6.15'
       tags :pre_upgrade_checks
       run_strategy :fail_slow
     end
@@ -28,13 +28,13 @@ def compose
       add_steps(find_checks(:default))
       add_steps(find_checks(:pre_upgrade))
       add_step(Checks::Foreman::CheckpointSegments)
-      add_step(Checks::Repositories::Validate.new(:version => '6.14'))
+      add_step(Checks::Repositories::Validate.new(:version => '6.15'))
     end
   end
 
   class PreMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures before migrating to Capsule 6.14.z'
+      description 'Procedures before migrating to Capsule 6.15'
       tags :pre_migrations
     end
 
@@ -45,7 +45,7 @@ def compose
 
   class Migrations < Abstract
     upgrade_metadata do
-      description 'Migration scripts to Capsule 6.14.z'
+      description 'Migration scripts to Capsule 6.15'
       tags :migrations
     end
 
@@ -54,7 +54,7 @@ def set_context_mapping
     end
 
     def compose
-      add_step(Procedures::Repositories::Setup.new(:version => '6.14'))
+      add_step(Procedures::Repositories::Setup.new(:version => '6.15'))
       modules_to_enable = ["satellite-capsule:#{el_short_name}"]
       add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
       add_step(Procedures::Packages::Update.new(:assumeyes => true,
@@ -67,7 +67,7 @@ def compose
 
   class PostMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures after migrating to Capsule 6.14.z'
+      description 'Procedures after migrating to Capsule 6.15'
       tags :post_migrations
     end
 
@@ -80,7 +80,7 @@ def compose
 
   class PostUpgradeChecks < Abstract
     upgrade_metadata do
-      description 'Checks after upgrading to Capsule 6.14.z'
+      description 'Checks after upgrading to Capsule 6.15'
       tags :post_upgrade_checks
       run_strategy :fail_slow
     end
diff --git a/definitions/scenarios/upgrade_to_capsule_6_14.rb b/definitions/scenarios/upgrade_to_capsule_6_15_z.rb
similarity index 80%
rename from definitions/scenarios/upgrade_to_capsule_6_14.rb
rename to definitions/scenarios/upgrade_to_capsule_6_15_z.rb
index 63a0a9356..5a3ea6277 100644
--- a/definitions/scenarios/upgrade_to_capsule_6_14.rb
+++ b/definitions/scenarios/upgrade_to_capsule_6_15_z.rb
@@ -1,25 +1,25 @@
-module Scenarios::Capsule_6_14
+module Scenarios::Capsule_6_15_z
   class Abstract < ForemanMaintain::Scenario
     def self.upgrade_metadata(&block)
       metadata do
         tags :upgrade_scenario
         confine do
           feature(:capsule) &&
-            (feature(:capsule).current_minor_version == '6.13' || \
-            ForemanMaintain.upgrade_in_progress == '6.14')
+            (feature(:capsule).current_minor_version == '6.15' || \
+              ForemanMaintain.upgrade_in_progress == '6.15.z')
         end
         instance_eval(&block)
       end
     end
 
     def target_version
-      '6.14'
+      '6.15.z'
     end
   end
 
   class PreUpgradeCheck < Abstract
     upgrade_metadata do
-      description 'Checks before upgrading to Capsule 6.14'
+      description 'Checks before upgrading to Capsule 6.15.z'
       tags :pre_upgrade_checks
       run_strategy :fail_slow
     end
@@ -28,13 +28,13 @@ def compose
       add_steps(find_checks(:default))
       add_steps(find_checks(:pre_upgrade))
       add_step(Checks::Foreman::CheckpointSegments)
-      add_step(Checks::Repositories::Validate.new(:version => '6.14'))
+      add_step(Checks::Repositories::Validate.new(:version => '6.15'))
     end
   end
 
   class PreMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures before migrating to Capsule 6.14'
+      description 'Procedures before migrating to Capsule 6.15.z'
       tags :pre_migrations
     end
 
@@ -45,7 +45,7 @@ def compose
 
   class Migrations < Abstract
     upgrade_metadata do
-      description 'Migration scripts to Capsule 6.14'
+      description 'Migration scripts to Capsule 6.15.z'
       tags :migrations
     end
 
@@ -54,7 +54,7 @@ def set_context_mapping
     end
 
     def compose
-      add_step(Procedures::Repositories::Setup.new(:version => '6.14'))
+      add_step(Procedures::Repositories::Setup.new(:version => '6.15'))
       modules_to_enable = ["satellite-capsule:#{el_short_name}"]
       add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
       add_step(Procedures::Packages::Update.new(:assumeyes => true,
@@ -67,7 +67,7 @@ def compose
 
   class PostMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures after migrating to Capsule 6.14'
+      description 'Procedures after migrating to Capsule 6.15.z'
       tags :post_migrations
     end
 
@@ -80,7 +80,7 @@ def compose
 
   class PostUpgradeChecks < Abstract
     upgrade_metadata do
-      description 'Checks after upgrading to Capsule 6.14'
+      description 'Checks after upgrading to Capsule 6.15.z'
       tags :post_upgrade_checks
       run_strategy :fail_slow
     end
diff --git a/definitions/scenarios/upgrade_to_satellite_6_14_z.rb b/definitions/scenarios/upgrade_to_satellite_6_15.rb
similarity index 82%
rename from definitions/scenarios/upgrade_to_satellite_6_14_z.rb
rename to definitions/scenarios/upgrade_to_satellite_6_15.rb
index 8ee4fbd1d..b62f1aa0c 100644
--- a/definitions/scenarios/upgrade_to_satellite_6_14_z.rb
+++ b/definitions/scenarios/upgrade_to_satellite_6_15.rb
@@ -1,4 +1,4 @@
-module Scenarios::Satellite_6_14_z
+module Scenarios::Satellite_6_15
   class Abstract < ForemanMaintain::Scenario
     def self.upgrade_metadata(&block)
       metadata do
@@ -6,20 +6,20 @@ def self.upgrade_metadata(&block)
         confine do
           feature(:satellite) &&
             (feature(:satellite).current_minor_version == '6.14' || \
-            ForemanMaintain.upgrade_in_progress == '6.14.z')
+            ForemanMaintain.upgrade_in_progress == '6.15')
         end
         instance_eval(&block)
       end
     end
 
     def target_version
-      '6.14.z'
+      '6.15'
     end
   end
 
   class PreUpgradeCheck < Abstract
     upgrade_metadata do
-      description 'Checks before upgrading to Satellite 6.14.z'
+      description 'Checks before upgrading to Satellite 6.15'
       tags :pre_upgrade_checks
       run_strategy :fail_slow
     end
@@ -28,13 +28,13 @@ def compose
       add_steps(find_checks(:default))
       add_steps(find_checks(:pre_upgrade))
       add_step(Checks::Foreman::CheckpointSegments)
-      add_step(Checks::Repositories::Validate.new(:version => '6.14'))
+      add_step(Checks::Repositories::Validate.new(:version => '6.15'))
     end
   end
 
   class PreMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures before migrating to Satellite 6.14.z'
+      description 'Procedures before migrating to Satellite 6.15'
       tags :pre_migrations
     end
 
@@ -45,8 +45,9 @@ def compose
 
   class Migrations < Abstract
     upgrade_metadata do
-      description 'Migration scripts to Satellite 6.14.z'
+      description 'Migration scripts to Satellite 6.15'
       tags :migrations
+      run_strategy :fail_fast
     end
 
     def set_context_mapping
@@ -54,7 +55,7 @@ def set_context_mapping
     end
 
     def compose
-      add_step(Procedures::Repositories::Setup.new(:version => '6.14'))
+      add_step(Procedures::Repositories::Setup.new(:version => '6.15'))
       modules_to_enable = ["satellite:#{el_short_name}"]
       add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
       add_step(Procedures::Packages::Update.new(:assumeyes => true,
@@ -68,7 +69,7 @@ def compose
 
   class PostMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures after migrating to Satellite 6.14.z'
+      description 'Procedures after migrating to Satellite 6.15'
       tags :post_migrations
     end
 
@@ -81,7 +82,7 @@ def compose
 
   class PostUpgradeChecks < Abstract
     upgrade_metadata do
-      description 'Checks after upgrading to Satellite 6.14.z'
+      description 'Checks after upgrading to Satellite 6.15'
       tags :post_upgrade_checks
       run_strategy :fail_slow
     end
diff --git a/definitions/scenarios/upgrade_to_satellite_6_14.rb b/definitions/scenarios/upgrade_to_satellite_6_15_z.rb
similarity index 80%
rename from definitions/scenarios/upgrade_to_satellite_6_14.rb
rename to definitions/scenarios/upgrade_to_satellite_6_15_z.rb
index c2c7933b6..932c26899 100644
--- a/definitions/scenarios/upgrade_to_satellite_6_14.rb
+++ b/definitions/scenarios/upgrade_to_satellite_6_15_z.rb
@@ -1,25 +1,25 @@
-module Scenarios::Satellite_6_14
+module Scenarios::Satellite_6_15_z
   class Abstract < ForemanMaintain::Scenario
     def self.upgrade_metadata(&block)
       metadata do
         tags :upgrade_scenario
         confine do
           feature(:satellite) &&
-            (feature(:satellite).current_minor_version == '6.13' || \
-            ForemanMaintain.upgrade_in_progress == '6.14')
+            (feature(:satellite).current_minor_version == '6.15' || \
+            ForemanMaintain.upgrade_in_progress == '6.15.z')
         end
         instance_eval(&block)
       end
     end
 
     def target_version
-      '6.14'
+      '6.15.z'
     end
   end
 
   class PreUpgradeCheck < Abstract
     upgrade_metadata do
-      description 'Checks before upgrading to Satellite 6.14'
+      description 'Checks before upgrading to Satellite 6.15.z'
       tags :pre_upgrade_checks
       run_strategy :fail_slow
     end
@@ -28,13 +28,13 @@ def compose
       add_steps(find_checks(:default))
       add_steps(find_checks(:pre_upgrade))
       add_step(Checks::Foreman::CheckpointSegments)
-      add_step(Checks::Repositories::Validate.new(:version => '6.14'))
+      add_step(Checks::Repositories::Validate.new(:version => '6.15'))
     end
   end
 
   class PreMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures before migrating to Satellite 6.14'
+      description 'Procedures before migrating to Satellite 6.15.z'
       tags :pre_migrations
     end
 
@@ -45,9 +45,8 @@ def compose
 
   class Migrations < Abstract
     upgrade_metadata do
-      description 'Migration scripts to Satellite 6.14'
+      description 'Migration scripts to Satellite 6.15.z'
       tags :migrations
-      run_strategy :fail_fast
     end
 
     def set_context_mapping
@@ -55,7 +54,7 @@ def set_context_mapping
     end
 
     def compose
-      add_step(Procedures::Repositories::Setup.new(:version => '6.14'))
+      add_step(Procedures::Repositories::Setup.new(:version => '6.15'))
       modules_to_enable = ["satellite:#{el_short_name}"]
       add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
       add_step(Procedures::Packages::Update.new(:assumeyes => true,
@@ -69,7 +68,7 @@ def compose
 
   class PostMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures after migrating to Satellite 6.14'
+      description 'Procedures after migrating to Satellite 6.15.z'
       tags :post_migrations
     end
 
@@ -82,7 +81,7 @@ def compose
 
   class PostUpgradeChecks < Abstract
     upgrade_metadata do
-      description 'Checks after upgrading to Satellite 6.14'
+      description 'Checks after upgrading to Satellite 6.15.z'
       tags :post_upgrade_checks
       run_strategy :fail_slow
     end