diff --git a/docker/services/neutron-l3.yaml b/docker/services/neutron-l3.yaml
index 65ffb5d67f..086b68fbdc 100644
--- a/docker/services/neutron-l3.yaml
+++ b/docker/services/neutron-l3.yaml
@@ -76,12 +76,18 @@ parameters:
       specified, because radvd is spawned as root, no "username" parameter
       will be passed
     type: string
+  NeutronL3AgentExtensions:
+    default: ""
+    description: |
+        Comma-separated list of extensions enabled for the Neutron L3 agent.
+    type: comma_delimited_list
 
 conditions:
   keepalived_wrapper_enabled: {equals: [{get_param: NeutronEnableKeepalivedWrapper}, true]}
   haproxy_wrapper_enabled: {equals: [{get_param: NeutronEnableHaproxyDockerWrapper}, true]}
   dibbler_wrapper_enabled: {equals: [{get_param: NeutronEnableDibblerDockerWrapper}, true]}
   radvd_wrapper_enabled: {equals: [{get_param: NeutronEnableRadvdDockerWrapper}, true]}
+  l3_agent_extensions_empty: {equals : [{get_param: NeutronL3AgentExtensions}, "''"]}
 
 resources:
 
@@ -127,7 +133,11 @@ outputs:
             tripleo::profile::base::neutron::l3_agent_wrappers::radvd_process_wrapper: '/var/lib/neutron/radvd_wrapper'
             tripleo::profile::base::neutron::l3_agent_wrappers::radvd_image: {get_param: DockerNeutronL3AgentImage}
           - neutron::agents::l3::radvd_user: {get_param: NeutronL3AgentRadvdUser}
-
+          -
+            if:
+            - l3_agent_extensions_empty
+            - {}
+            - neutron::agents::l3::extensions: {get_param: NeutronL3AgentExtensions}
       logging_source: {get_attr: [NeutronL3Base, role_data, logging_source]}
       logging_groups: {get_attr: [NeutronL3Base, role_data, logging_groups]}
       service_config_settings:
diff --git a/releasenotes/notes/enable-port-forwarding-in-neutron-956cb21a3310e881.yaml b/releasenotes/notes/enable-port-forwarding-in-neutron-956cb21a3310e881.yaml
new file mode 100644
index 0000000000..53c6b693a1
--- /dev/null
+++ b/releasenotes/notes/enable-port-forwarding-in-neutron-956cb21a3310e881.yaml
@@ -0,0 +1,8 @@
+---
+other:
+  - |
+    Add "port_forwarding" service plugin and L3 agent extension to be enabled
+    by default when Neutron ML2 plugin with OVS driver is used.
+    New config option "NeutronL3AgentExtensions" is also added. This
+    new option allows to set list of L3 agent's extensions which should be
+    used by agent.