diff --git a/container-images/tcib/base/keepalived/keepalived.yaml b/container-images/tcib/base/keepalived/keepalived.yaml
deleted file mode 100644
index 52352c064..000000000
--- a/container-images/tcib/base/keepalived/keepalived.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tcib_actions:
-- run: dnf -y install {{ tcib_packages.common | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf
-tcib_packages:
-  common:
-  - hostname
-  - keepalived
diff --git a/container-images/tripleo_containers.yaml b/container-images/tripleo_containers.yaml
index f94d1bb6d..236caa5ac 100644
--- a/container-images/tripleo_containers.yaml
+++ b/container-images/tripleo_containers.yaml
@@ -83,8 +83,6 @@ container_images:
   image_source: tripleo
 - imagename: quay.io/tripleomaster/openstack-iscsid:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-keepalived:current-tripleo
-  image_source: tripleo
 - imagename: quay.io/tripleomaster/openstack-keystone:current-tripleo
   image_source: tripleo
 - imagename: quay.io/tripleomaster/openstack-manila-api:current-tripleo
diff --git a/container-images/tripleo_containers.yaml.j2 b/container-images/tripleo_containers.yaml.j2
index 279e18af1..dd3e9b0eb 100644
--- a/container-images/tripleo_containers.yaml.j2
+++ b/container-images/tripleo_containers.yaml.j2
@@ -361,15 +361,6 @@ container_images_template:
   services:
   - OS::TripleO::Services::Iscsid
 
-- imagename: "{{namespace}}/{{name_prefix}}keepalived{{name_suffix}}:{{tag}}"
-  image_source: tripleo
-  params:
-  - ContainerKeepalivedConfigImage
-  - ContainerKeepalivedImage
-  services:
-  - OS::TripleO::Services::Keepalived
-  - OS::TripleO::Services::UndercloudKeepalived
-
 - imagename: "{{namespace}}/{{name_prefix}}keystone{{name_suffix}}:{{tag}}"
   image_source: tripleo
   params:
diff --git a/tripleo_common/tests/inventory_data/cell1_dynamic.json b/tripleo_common/tests/inventory_data/cell1_dynamic.json
index 902320588..45836220b 100644
--- a/tripleo_common/tests/inventory_data/cell1_dynamic.json
+++ b/tripleo_common/tests/inventory_data/cell1_dynamic.json
@@ -186,14 +186,6 @@
             "ansible_ssh_user": "heat-admin"
         }
     },
-    "keepalived": {
-        "children": [
-            "CellController"
-        ],
-        "vars": {
-            "ansible_ssh_user": "heat-admin"
-        }
-    },
     "kernel": {
         "children": [
             "CellController",
diff --git a/tripleo_common/tests/inventory_data/cell1_static.yaml b/tripleo_common/tests/inventory_data/cell1_static.yaml
index 158dd79a4..2587ec164 100644
--- a/tripleo_common/tests/inventory_data/cell1_static.yaml
+++ b/tripleo_common/tests/inventory_data/cell1_static.yaml
@@ -70,10 +70,6 @@ kernel:
     CellController: {}
     Compute: {}
   vars: {ansible_ssh_user: heat-admin}
-keepalived:
-  children:
-    CellController: {}
-  vars: {ansible_ssh_user: heat-admin}
 mysql:
   children:
     CellController: {}
diff --git a/tripleo_common/tests/inventory_data/merged_dynamic.json b/tripleo_common/tests/inventory_data/merged_dynamic.json
index ac717ba55..a14c3b8da 100644
--- a/tripleo_common/tests/inventory_data/merged_dynamic.json
+++ b/tripleo_common/tests/inventory_data/merged_dynamic.json
@@ -263,14 +263,6 @@
           "ansible_ssh_user": "heat-admin"
         }
     },
-    "cell1_keepalived": {
-        "children": [
-            "cell1_CellController"
-        ],
-        "vars": {
-          "ansible_ssh_user": "heat-admin"
-        }
-    },
     "cell1_kernel": {
         "children": [
             "cell1_CellController",
@@ -529,12 +521,6 @@
             "overcloud_iscsid"
         ]
     },
-    "keepalived": {
-        "children": [
-            "cell1_keepalived",
-            "overcloud_keepalived"
-        ]
-    },
     "kernel": {
         "children": [
             "cell1_kernel",
@@ -845,14 +831,6 @@
           "ansible_ssh_user": "heat-admin"
         }
     },
-    "overcloud_keepalived": {
-        "children": [
-            "overcloud_Controller"
-        ],
-        "vars": {
-          "ansible_ssh_user": "heat-admin"
-        }
-    },
     "overcloud_kernel": {
         "children": [
             "overcloud_Compute",
diff --git a/tripleo_common/tests/inventory_data/merged_static.yaml b/tripleo_common/tests/inventory_data/merged_static.yaml
index d533a6d4a..cfc143795 100644
--- a/tripleo_common/tests/inventory_data/merged_static.yaml
+++ b/tripleo_common/tests/inventory_data/merged_static.yaml
@@ -93,15 +93,6 @@ cell1_kernel:
     cell1_Compute: {}
   vars:
     ansible_ssh_user: heat-admin
-keepalived:
-  children:
-    cell1_keepalived: {}
-    overcloud_keepalived: {}
-cell1_keepalived:
-  children:
-    cell1_CellController: {}
-  vars:
-    ansible_ssh_user: heat-admin
 mysql:
   children:
     cell1_mysql: {}
@@ -519,11 +510,6 @@ overcloud_keystone_admin_api:
     overcloud_Controller: {}
   vars:
     ansible_ssh_user: heat-admin
-overcloud_keepalived:
-  children:
-    overcloud_Controller: {}
-  vars:
-    ansible_ssh_user: heat-admin
 overcloud_certmonger_user:
   children:
     overcloud_Compute: {}
diff --git a/tripleo_common/tests/inventory_data/overcloud_dynamic.json b/tripleo_common/tests/inventory_data/overcloud_dynamic.json
index 86e7621a4..c94b75d82 100644
--- a/tripleo_common/tests/inventory_data/overcloud_dynamic.json
+++ b/tripleo_common/tests/inventory_data/overcloud_dynamic.json
@@ -254,14 +254,6 @@
             "ansible_ssh_user": "heat-admin"
         }
     },
-    "keepalived": {
-        "children": [
-            "Controller"
-        ],
-        "vars": {
-            "ansible_ssh_user": "heat-admin"
-        }
-    },
     "kernel": {
         "children": [
             "Compute",
diff --git a/tripleo_common/tests/inventory_data/overcloud_static.yaml b/tripleo_common/tests/inventory_data/overcloud_static.yaml
index 1afdbdf31..b66606ebb 100644
--- a/tripleo_common/tests/inventory_data/overcloud_static.yaml
+++ b/tripleo_common/tests/inventory_data/overcloud_static.yaml
@@ -131,10 +131,6 @@ keystone_admin_api:
   children:
     Controller: {}
   vars: {ansible_ssh_user: heat-admin}
-keepalived:
-  children:
-    Controller: {}
-  vars: {ansible_ssh_user: heat-admin}
 certmonger_user:
   children:
     Compute: {}
diff --git a/tripleo_common/tests/inventory_data/single_dynamic.json b/tripleo_common/tests/inventory_data/single_dynamic.json
index a73a3a6c6..01722f557 100644
--- a/tripleo_common/tests/inventory_data/single_dynamic.json
+++ b/tripleo_common/tests/inventory_data/single_dynamic.json
@@ -357,19 +357,6 @@
           "ansible_ssh_user": "heat-admin"
         }
     },
-    "keepalived": {
-        "children": [
-            "overcloud_keepalived"
-        ]
-    },
-    "overcloud_keepalived": {
-        "children": [
-            "overcloud_Controller"
-        ],
-        "vars": {
-          "ansible_ssh_user": "heat-admin"
-        }
-    },
     "kernel": {
         "children": [
             "overcloud_kernel"
diff --git a/tripleo_common/tests/inventory_data/single_static.yaml b/tripleo_common/tests/inventory_data/single_static.yaml
index bfa6e25a2..ad2ec32d2 100644
--- a/tripleo_common/tests/inventory_data/single_static.yaml
+++ b/tripleo_common/tests/inventory_data/single_static.yaml
@@ -250,14 +250,6 @@ overcloud_keystone_admin_api:
   - overcloud_Controller
   vars:
     ansible_ssh_user: heat-admin
-keepalived:
-  children:
-  - overcloud_keepalived
-overcloud_keepalived:
-  children:
-  - overcloud_Controller
-  vars:
-    ansible_ssh_user: heat-admin
 certmonger_user:
   children:
   - overcloud_certmonger_user