diff --git a/Makefile b/Makefile
index 5964a0a..ca75a4d 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,8 @@ VERBOSITY=debug
 ## build
 
 build:
-	$(shell docker-multi-arch-builder build -n filebeat --platforms $(PLATFORM) -v $(VERBOSITY))
+	docker manifest rm docker.registry:5000/filebeat:latest
+	docker-multi-arch-builder build -n filebeat --platforms $(PLATFORM) -v $(VERBOSITY)
 
 ## management
 
diff --git a/filebeat-docker.yml b/filebeat-docker.yml
index 91bf0a5..8f83ef6 100644
--- a/filebeat-docker.yml
+++ b/filebeat-docker.yml
@@ -21,7 +21,7 @@ processors:
       host: "unix:///var/run/docker.sock"
   - add_host_metadata: ~
   - dissect:
-      tokenizer: '%{nginx.remote_addr} - %{nginx.remote_user} [%{nginx.time}] %{nginx.host} "%{nginx.request}" %{nginx.status|integer} %{nginx.http_referer} "%{nginx.http_user_agent}" %{nginx.http_x_forwarded_for} %{nginx.request_id} "%{nginx.geoip_country_name}" %{nginx.geoip_country_code} %{nginx.geoip.lat|double} %{nginx.geoip.lon|double} req_header:"%{nginx.header.req}" resp_header:"%{nginx.header.resp}"'
+      tokenizer: '%{nginx.remote_addr} - %{nginx.remote_user} [%{nginx.time}] %{nginx.host} "%{nginx.request}" %{nginx.status|integer} %{nginx.http_referer} "%{nginx.http_user_agent}" %{nginx.http_x_forwarded_for} %{nginx.request_id} "%{nginx.geoip_country_name}" %{nginx.geoip_country_code} "%{nginx.geoip_asn_name}" %{nginx.geoip_asn_number|integer} location:"%{nginx.geoip.lat|double}" "%{nginx.geoip.lon|double}" req_header:"%{nginx.header.req}" resp_header:"%{nginx.header.resp}"'
       trim_values: all
       target_prefix: ""
       field: "message"
@@ -29,7 +29,7 @@ processors:
         equals:
           container.name: nginxfront
   - dissect:
-      tokenizer: '%{php.time} [%{php.status}] %{php.info}: %{php.message}, client: %{php.client}, server: %{php.server}, request: "%{php.request}", upstream: "%{php.upstream}", host: "%{php.host}"'
+      tokenizer: '%{php.time} [%{php.status}] %{php.info}: %{php.message}, client: %{php.client}, server: %{php.server}, request: "%{php.request}", host: "%{php.host}"'
       target_prefix: ""
       field: "message"
       when: