diff --git a/tripleoclient/tests/v1/test_container_image.py b/tripleoclient/tests/v1/test_container_image.py
index 31d65d7b9..6e35bf8be 100644
--- a/tripleoclient/tests/v1/test_container_image.py
+++ b/tripleoclient/tests/v1/test_container_image.py
@@ -186,10 +186,13 @@ class TestContainerImagePrepare(TestPluginV1):
         mock_get.side_effect = requests.exceptions.SSLError('ouch')
         mock_bsf.return_value = set(['OS::TripleO::Services::AodhEvaluator'])
 
-        resource_registry = {'resource_registry': {
+        resource_registry = {
+          'parameter_defaults': {
+            'NeutronMechanismDrivers': 'ovn',
+            }, 'resource_registry': {
             'OS::TripleO::Services::AodhEvaluator': aodh_file,
             'OS::TripleO::Services::AodhApi': aodh_file
-        }}
+          }}
         pmef.return_value = None, resource_registry
 
         arglist = [
@@ -255,6 +258,7 @@ class TestContainerImagePrepare(TestPluginV1):
                 'ceph_tag': 'mytag',
                 'ceph_image': 'mydaemon',
                 'tag': 'passed-ci',
+                'neutron_driver': 'ovn',
                 'ceph_namespace': 'myceph',
                 'name_prefix': 'os-'
             },
diff --git a/tripleoclient/v1/container_image.py b/tripleoclient/v1/container_image.py
index 7b7a41ed8..bdc030423 100644
--- a/tripleoclient/v1/container_image.py
+++ b/tripleoclient/v1/container_image.py
@@ -427,6 +427,8 @@ class PrepareImageFiles(command.Command):
             'name_suffix': parsed_args.suffix,
         }
         self.parse_set_values(mapping_args, parsed_args.set)
+        pd = env.get('parameter_defaults', {})
+        kolla_builder.set_neutron_driver(pd, mapping_args)
 
         output_images_file = (parsed_args.output_images_file
                               or 'container_images.yaml')