diff --git a/scripts/drone-build.sh b/scripts/drone-build.sh
index 1acac65..4236ca8 100755
--- a/scripts/drone-build.sh
+++ b/scripts/drone-build.sh
@@ -21,7 +21,7 @@ source_branch=$DRONE_SOURCE_BRANCH
 
 if { contains "$branch" "feature_" && [ "$event" = push ]; } ; then
     echo "BUILD FEATURE: $branch"
-    docker build -t docker.pbiernat.dev/nginx-php:${branch} .
+    docker build -t docker.pbiernat.dev/nginx-php:$branch .
     return 0
 fi
 
@@ -31,7 +31,7 @@ if { [ "$branch" = develop ] && [ "$event" = pull_request ]; } ; then
     return 0
 fi
 
-if { [ "$branch" = develop ] && [ "$event" = push ]; } ; then
+if { [ "$branch" = develop ] && [ "$event" = push ] && [ "$step_name" != build_feature ]; } ; then
     echo "BUILD DEV"
     docker build -t docker.pbiernat.dev/nginx-php:dev .
     return 0
diff --git a/scripts/drone-publish.sh b/scripts/drone-publish.sh
index 63593ca..572645d 100755
--- a/scripts/drone-publish.sh
+++ b/scripts/drone-publish.sh
@@ -20,7 +20,7 @@ source_branch=$DRONE_SOURCE_BRANCH
 docker login docker.pbiernat.dev -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
 
 if { [ "$branch" = develop ] && [ "$event" = pull_request ]; } ; then
-    echo "PUSH FEATURE: ${source_branch}"
+    echo "PUSH FEATURE: $source_branch"
     docker push docker.pbiernat.dev/nginx-php:$source_branch
     return 0
 fi