diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2
index dece02e251..ee154ce170 100644
--- a/docker/ironic/ironic-conductor/Dockerfile.j2
+++ b/docker/ironic/ironic-conductor/Dockerfile.j2
@@ -19,11 +19,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'openstack-ironic-staging-drivers',
             'parted',
             'psmisc',
-            'shellinabox',
             'util-linux',
             'xfsprogs'
         ] %}
 
+        # FIXME(mgoddard): Removed shellinabox which is not currently provided
+        # by EPEL8.
         {% if distro_python_version.startswith('3') %}
         {% set ironic_conductor_packages = ironic_conductor_packages + [
             'python3dist\(ansible\)',
@@ -46,6 +47,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'python-scciclient',
             'python-sushy',
             'python2-ImcSdk',
+            'shellinabox',
             'systemd-python'
         ] %}
         {% endif %}
@@ -92,16 +94,18 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'ipmitool',
             'parted',
             'psmisc',
-            'shellinabox',
             'util-linux',
             'xfsprogs',
         ] %}
+        # FIXME(mgoddard): Removed shellinabox which is not currently provided
+        # by EPEL8.
         {% if distro_python_version.startswith('3') %}
         {% set ironic_conductor_packages = ironic_conductor_packages + [
             'systemd-udev',
         ] %}
         {% else %}
         {% set ironic_conductor_packages = ironic_conductor_packages + [
+            'shellinabox',
             'systemd',
         ] %}
         {% endif %}
diff --git a/kolla/image/build.py b/kolla/image/build.py
index a70919842d..ef5dcea191 100755
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -153,7 +153,6 @@ UNBUILDABLE_IMAGES = {
         "glance-base",           # Missing Ceph repo
         "gnocchi-base",          # Missing Ceph repo
         "hacluster-base",        # Missing hacluster repo
-        "ironic-conductor",      # Missing shellinabox package
         "kibana",                # Missing elasticsearch repo
         "manila-share",          # Missing Ceph repo
         "mongodb",               # Missing mongodb and mongodb-server packages