diff --git a/data/etc/nginx/apigw.conf b/data/etc/nginx/apigw.conf
index 9a4d73d..8287dd4 100644
--- a/data/etc/nginx/apigw.conf
+++ b/data/etc/nginx/apigw.conf
@@ -2,7 +2,8 @@ include apigw_backends.conf;
 include apigw_keys.conf;
 
 server {
-    access_log /var/log/nginx/apigw_access.log main; 
+    access_log /var/log/nginx/apigw_access.log main;
+        error_log /var/log/nginx/apigw_error.log warn;
 
     listen 80;
     # listen 443 ssl;
@@ -30,9 +31,6 @@ server {
     location = /_validate_apikey {
         internal;
 
-        access_log /var/log/nginx/apigw_access.log main;
-        error_log /var/log/nginx/apigw_error.log warn;
-
         if ($http_apikey = "") {
             return 401; # Unauthorized
         }
diff --git a/deploy/image-build.sh b/deploy/image-build.sh
index dd8fad0..7eee911 100755
--- a/deploy/image-build.sh
+++ b/deploy/image-build.sh
@@ -3,11 +3,4 @@
 
 export IMAGE_NAME="git.pbiernat.dev/egommerce/apigw-svc"
 
-branch=${DRONE_TAG:=$CI_COMMIT_BRANCH}
-branch=$(echo $branch | grep -v /) || echo $branch ;
-p1=$(echo $branch | cut -d / -f1 -s) &&
-p2=$(echo $branch | cut -d / -f2 -s) &&
-tag=${branch:=$p1-$p2} && 
-echo "Building" $tag
-
 docker build --rm --cache-from "$IMAGE_NAME:latest" -t "$IMAGE_NAME:latest" .