diff --git a/heatclient/tests/unit/test_shell.py b/heatclient/tests/unit/test_shell.py
index e4cf2ca6..e63ca7a6 100644
--- a/heatclient/tests/unit/test_shell.py
+++ b/heatclient/tests/unit/test_shell.py
@@ -1699,7 +1699,7 @@ class ShellTestUserPass(ShellBase):
         update_text = self.shell(
             'stack-update teststack2/2 '
             '--template-file=%s '
-            '--enable-rollback '
+            '--rollback on '
             '--existing' % template_file)
 
         required = [
@@ -1731,7 +1731,7 @@ class ShellTestUserPass(ShellBase):
         update_text = self.shell(
             'stack-update teststack2/2 '
             '--template-file=%s '
-            '--enable-rollback '
+            '--rollback on '
             '--parameters="KeyPairName=updated_key" '
             '--existing' % template_file)
 
@@ -1767,7 +1767,7 @@ class ShellTestUserPass(ShellBase):
         update_text = self.shell(
             'stack-update teststack2/2 '
             '--template-file=%s '
-            '--enable-rollback '
+            '--rollback on '
             '--existing '
             '--clear-parameter=InstanceType '
             '--clear-parameter=DBUsername '
@@ -1807,7 +1807,7 @@ class ShellTestUserPass(ShellBase):
         update_text = self.shell(
             'stack-update teststack2/2 '
             '--template-file=%s '
-            '--enable-rollback '
+            '--rollback on '
             '--existing '
             '--parameters="KeyPairName=updated_key" '
             '--clear-parameter=InstanceType '
@@ -1873,7 +1873,7 @@ class ShellTestUserPass(ShellBase):
         update_text = self.shell(
             'stack-update teststack2/2 '
             '--template-file=%s '
-            '--enable-rollback '
+            '--rollback on '
             '--existing '
             '--parameters="KeyPairName=updated_key" '
             '--tags=tag1,tag2 ' % template_file)
@@ -1942,7 +1942,7 @@ class ShellTestUserPass(ShellBase):
         update_preview_text = self.shell(
             'stack-update teststack2/2 '
             '--template-file=%s '
-            '--enable-rollback '
+            '--rollback on '
             '--parameters="KeyPairName=updated_key" '
             '--dry-run ' % template_file)
 
@@ -1963,7 +1963,7 @@ class ShellTestUserPass(ShellBase):
         update_preview_text = self.shell(
             'stack-update teststack2/2 '
             '--template-file=%s '
-            '--enable-rollback '
+            '--rollback on '
             '--show-nested '
             '--parameters="KeyPairName=updated_key" '
             '--dry-run ' % template_file)
@@ -1985,7 +1985,7 @@ class ShellTestUserPass(ShellBase):
         update_preview_text = self.shell(
             'stack-update teststack2/2 '
             '--template-file=%s '
-            '--enable-rollback '
+            '--rollback on '
             '--existing '
             '--parameters="KeyPairName=updated_key" '
             '--dry-run ' % template_file)
diff --git a/heatclient/v1/shell.py b/heatclient/v1/shell.py
index f7e6fe2d..d2a1bd9b 100644
--- a/heatclient/v1/shell.py
+++ b/heatclient/v1/shell.py
@@ -449,12 +449,6 @@ def do_stack_show(hc, args):
 @utils.arg('-t', '--timeout', metavar='<TIMEOUT>',
            type=int,
            help=_('Stack update timeout in minutes.'))
-@utils.arg('-r', '--enable-rollback', default=False, action="store_true",
-           help=_('DEPRECATED! Use %(arg)s argument instead. '
-                  'Enable rollback on stack update failure. '
-                  'NOTE: default behavior is now to use the rollback value '
-                  'of existing stack.')
-           % {'arg': '--rollback'})
 @utils.arg('--rollback', default=None, metavar='<VALUE>',
            help=_('Set rollback on update failure. '
                   'Values %(true)s  set rollback to enabled. '
@@ -544,11 +538,6 @@ def do_stack_update(hc, args):
             raise exc.CommandError(str(ex))
         else:
             fields['disable_rollback'] = not rollback
-    # TODO(pshchelo): remove the following 'else' clause after deprecation
-    # period of --enable-rollback switch and assign -r shortcut to --rollback
-    else:
-        if args.enable_rollback:
-            fields['disable_rollback'] = False
 
     if args.dry_run is True:
         if args.show_nested:
diff --git a/releasenotes/notes/remove-stack-update-enable-rollback-d83bbdd6f7175b89.yaml b/releasenotes/notes/remove-stack-update-enable-rollback-d83bbdd6f7175b89.yaml
new file mode 100644
index 00000000..576736db
--- /dev/null
+++ b/releasenotes/notes/remove-stack-update-enable-rollback-d83bbdd6f7175b89.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    The ``heat stack-update`` command no longer supports
+    the ``--enable-rollback`` option. Use the ``--rollback`` option instead.