diff --git a/deployment/keepalived/keepalived-container-puppet.yaml b/deployment/keepalived/keepalived-container-puppet.yaml
index 49020c30fe..5cdfe0f1af 100644
--- a/deployment/keepalived/keepalived-container-puppet.yaml
+++ b/deployment/keepalived/keepalived-container-puppet.yaml
@@ -36,12 +36,6 @@ parameters:
     default: {}
     description: Parameters specific to the role
     type: json
-  # TODO(emilien) Remove when Keepalived 2.0.6 is out
-  # https://bugs.launchpad.net/tripleo/+bug/1791238
-  KeepalivedRestart:
-    default: false
-    description: Whether or not restart Keepalived. Useful for Undercloud only.
-    type: boolean
   ControlVirtualInterface:
     default: ''
     description: >
@@ -59,6 +53,22 @@ parameters:
   MonitoringSubscriptionKeepalived:
     default: 'overcloud-keepalived'
     type: string
+  # DEPRECATED: the following options are deprecated and are currently maintained
+  # for backwards compatibility. They will be removed in future release.
+  KeepalivedRestart:
+    default: false
+    description: Whether or not restart Keepalived. Deprecated and no effect.
+    type: boolean
+
+parameter_groups:
+- label: deprecated
+  description: |
+   The following parameters are deprecated and will be removed. They should not
+   be relied on for new deployments. If you have concerns regarding deprecated
+   parameters, please contact the TripleO development team on IRC or the
+   OpenStack mailing list.
+  parameters:
+  - KeepalivedRestart
 
 conditions:
   control_iface_empty: {equals : [{get_param: ControlVirtualInterface}, '']}
@@ -130,13 +140,6 @@ outputs:
               KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
             command: /usr/local/bin/kolla_start
       host_prep_tasks:
-        - name: Set fact for restarting Keepalived container
-          set_fact:
-            restart_keepalived: {get_param: KeepalivedRestart}
-        - name: Restart Keepalived container
-          shell: "{{container_cli}} restart keepalived"
-          when: restart_keepalived|bool
-          failed_when: false
         - name: load ip_vs module
           import_role:
             name: tripleo_module_load
diff --git a/environments/undercloud.yaml b/environments/undercloud.yaml
index ae94e61822..4825ee865a 100644
--- a/environments/undercloud.yaml
+++ b/environments/undercloud.yaml
@@ -201,9 +201,6 @@ parameter_defaults:
   MySQLServerOptions:
     mysqld:
       connect_timeout: 60
-  # TODO(emilien) Remove when Keepalived 2.0.6 is out
-  # https://bugs.launchpad.net/tripleo/+bug/1791238
-  KeepalivedRestart: true
   SshFirewallAllowAll: true
   UndercloudExtraConfig:
     aodh::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip_uri')}:11211"
diff --git a/releasenotes/notes/keepalived_depcrecated-12ac4e1d59d29e1d.yaml b/releasenotes/notes/keepalived_depcrecated-12ac4e1d59d29e1d.yaml
new file mode 100644
index 0000000000..e23781d2ef
--- /dev/null
+++ b/releasenotes/notes/keepalived_depcrecated-12ac4e1d59d29e1d.yaml
@@ -0,0 +1,8 @@
+---
+deprecations:
+  - |
+    KeepalivedRestart is deprecated and has no effect. The workaround isn't
+    needed anymore since we now deploy keepalived-2.0.10-4.
+    This version has support for 'dynamic_interfaces' which is required when
+    the network config was changed and os-net-config restarts the network
+    interface.