diff --git a/neutron/agents/_l2gw.sls b/neutron/agents/_l2gw.sls
index 53e048a..9f565a9 100644
--- a/neutron/agents/_l2gw.sls
+++ b/neutron/agents/_l2gw.sls
@@ -14,16 +14,24 @@
 
 {%- if not grains.get('noservices', False) %}
 
-# TODO: use service.masked state instead once salt get updated to 2017.7.0+
+{%- if grains['saltversioninfo'] < [2017, 7] %}
 service.mask:
   module.run:
   - m_name: neutron-l2gateway-agent
+{%- else %}
+l2gw_agent__service_mask:
+  service.masked:
+  - name: neutron-l2gateway-agent
+{%- endif %}
   - require_in:
     - pkg: l2gw_agent_packages
 
 neutron-l2gateway-agent:
   service.running:
   - enable: true
+{%- if grains['saltversioninfo'] >= [2017, 7] %}
+  - unmask: true
+{%- endif %}
   - watch:
     - file: /etc/neutron/l2gateway_agent.ini
     - file: /etc/neutron/neutron.conf
diff --git a/neutron/meta/fluentd.yml b/neutron/meta/fluentd.yml
index 5a5ca1d..39adee7 100644
--- a/neutron/meta/fluentd.yml
+++ b/neutron/meta/fluentd.yml
@@ -39,8 +39,8 @@
             emit_invalid_record_to_error: false
             parser:
               type: regexp
-              # Parse openstack http stats: https://regex101.com/r/Tf0XUK/3/
-              format: '\"(?<http_method>GET|POST|OPTIONS|DELETE|PUT|HEAD|TRACE|CONNECT|PATCH)\s(?<http_url>\S+)\s(?<http_version>[.\/\dHTFSP]+)\"(\sstatus:|)\s(?<http_status>\d{3})(\slen:|)\s(?<http_response_size>\d+)(\stime:|)\s(?<http_response_time>\d+\.\d+)'
+              # Parse openstack http stats: https://regex101.com/r/nuVmvy/1
+              format: '\"(?<http_method>GET|POST|OPTIONS|DELETE|PUT|HEAD|TRACE|CONNECT|PATCH)\s(?<http_url>\S+)\s(?<http_version>[.\/\dHTFSP]+)\"(\sstatus:|)\s(?<http_status>\d{3})(\s+len:|)\s(?<http_response_size>\d+)(\stime:|)\s(?<http_response_time>\d+\.\d+)'
               types: http_response_time:float
         match:
           unify_tag:
@@ -107,4 +107,4 @@
                 value: neutron
               - name: host
                 value: ${Hostname}
-{% endif %}
\ No newline at end of file
+{% endif %}