diff --git a/templates/stein/fwaas_driver.ini b/templates/stein/fwaas_driver.ini
new file mode 100644
index 00000000..cc33f770
--- /dev/null
+++ b/templates/stein/fwaas_driver.ini
@@ -0,0 +1,9 @@
+# stein
+###############################################################################
+# [ WARNING ]
+# Configuration file maintained by Juju. Local changes may be overwritten.
+###############################################################################
+[fwaas]
+agent_version = v2
+driver = iptables_v2
+enabled = True
diff --git a/templates/stein/l3_agent.ini b/templates/stein/l3_agent.ini
new file mode 100644
index 00000000..c95833c0
--- /dev/null
+++ b/templates/stein/l3_agent.ini
@@ -0,0 +1,30 @@
+# stein
+###############################################################################
+# [ WARNING ]
+# Configuration file maintained by Juju. Local changes may be overwritten.
+###############################################################################
+[DEFAULT]
+interface_driver = openvswitch
+root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
+handle_internal_only_routers = {{ handle_internal_only_router }}
+{% if plugin == 'n1kv' %}
+l3_agent_manager = neutron.agent.l3_agent.L3NATAgentWithStateReport
+external_network_bridge = br-int
+ovs_use_veth = False
+use_namespaces = True
+{% else %}
+ovs_use_veth = True
+{% endif %}
+{% if external_configuration_new -%}
+gateway_external_network_id =
+external_network_bridge =
+{% elif ext_net_id %}
+gateway_external_network_id = {{ ext_net_id }}
+{% else %}
+# Set default to deprecated external networking config
+external_network_bridge = br-ex
+{% endif -%}
+agent_mode = {{ agent_mode }}
+
+[AGENT]
+extensions = fwaas_v2
diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py
index 7ea66068..108fea3a 100644
--- a/tests/basic_deployment.py
+++ b/tests/basic_deployment.py
@@ -575,7 +575,11 @@ class NeutronGatewayBasicDeployment(OpenStackAmuletDeployment):
         }
         section = 'fwaas'
 
-        if self._get_openstack_release() >= self.xenial_newton:
+        if self._get_openstack_release() >= self.bionic_stein:
+            # Stein or later
+            expected['driver'] = 'iptables_v2'
+            expected['agent_version'] = 'v2'
+        elif self._get_openstack_release() >= self.xenial_newton:
             # Newton or later
             expected['driver'] = 'iptables'
             expected['agent_version'] = 'v1'