diff --git a/docker/neutron/neutron-agents/Dockerfile b/docker/neutron/neutron-agents/Dockerfile
index 5d50bbfc1f..89ce874bba 100644
--- a/docker/neutron/neutron-agents/Dockerfile
+++ b/docker/neutron/neutron-agents/Dockerfile
@@ -8,7 +8,7 @@ RUN easy_install supervisor
 RUN pip install supervisor-stdout
 
 # Install required packages
-RUN yum install -y openstack-neutron-linuxbridge \
+RUN yum install -y openstack-neutron openstack-neutron-linuxbridge \
         net-tools \
         && yum clean all
 
@@ -25,6 +25,12 @@ ADD check-scripts/check-dhcp-agent.sh /opt/kolla/neutron/
 ADD check-scripts/check-l3-agent.sh /opt/kolla/neutron/
 ADD check-scripts/check-metadata-agent.sh /opt/kolla/neutron/
 
+# This is needed to workaround a problem with the agents exiting if the
+# file is not present.  This file really shouldn't need to be present and
+# implies a configuration problem somewhere else in the code base, but
+# we are out of time.
+COPY fwaas_driver.ini /etc/neutron/
+
 # Configure supervisord
 RUN mkdir -p /var/log/supervisor/
 ADD supervisord.conf /etc/
diff --git a/docker/neutron/neutron-agents/fwaas_driver.ini b/docker/neutron/neutron-agents/fwaas_driver.ini
new file mode 100644
index 0000000000..41f761abf1
--- /dev/null
+++ b/docker/neutron/neutron-agents/fwaas_driver.ini
@@ -0,0 +1,3 @@
+[fwaas]
+#driver = neutron.services.firewall.drivers.linux.iptables_fwaas.IptablesFwaasDriver
+#enabled = True