diff --git a/.drone.yml b/.drone.yml
index 990c8bd..381b4f8 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -17,9 +17,12 @@ steps:
   privileged: true
   settings:
     dockerfile: ubuntu-20.04/Dockerfile
-    dry_run: true
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
     repo: lerentis/ansible
-    tag: ubuntu-20.04
+    tag: ubuntu-20.04-${DRONE_COMMIT_SHA}
   when:
     event:
     - push
@@ -29,9 +32,12 @@ steps:
   image: banzaicloud/drone-kaniko
   settings:
     dockerfile: ubuntu-18.04/Dockerfile
-    dry_run: true
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
     repo: lerentis/ansible
-    tag: ubuntu-18.04
+    tag: ubuntu-18.04-${DRONE_COMMIT_SHA}
   when:
     event:
     - push
@@ -41,9 +47,12 @@ steps:
   image: banzaicloud/drone-kaniko
   settings:
     dockerfile: ubuntu-16.04/Dockerfile
-    dry_run: true
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
     repo: lerentis/ansible
-    tag: ubuntu-16.04
+    tag: ubuntu-16.04-${DRONE_COMMIT_SHA}
   when:
     event:
     - push
@@ -53,9 +62,12 @@ steps:
   image: banzaicloud/drone-kaniko
   settings:
     dockerfile: ubuntu-14.04/Dockerfile
-    dry_run: true
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
     repo: lerentis/ansible
-    tag: ubuntu-14.04
+    tag: ubuntu-14.04-${DRONE_COMMIT_SHA}
   when:
     event:
     - push
@@ -65,9 +77,12 @@ steps:
   image: banzaicloud/drone-kaniko
   settings:
     dockerfile: fedora-24/Dockerfile
-    dry_run: true
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
     repo: lerentis/ansible
-    tag: fedora-24
+    tag: fedora-24-${DRONE_COMMIT_SHA}
   when:
     event:
     - push
@@ -77,9 +92,12 @@ steps:
   image: banzaicloud/drone-kaniko
   settings:
     dockerfile: alpine-3/Dockerfile
-    dry_run: true
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
     repo: lerentis/ansible
-    tag: alpine-3
+    tag: alpine-3-${DRONE_COMMIT_SHA}
   when:
     event:
     - push
@@ -89,9 +107,12 @@ steps:
   image: banzaicloud/drone-kaniko
   settings:
     dockerfile: debian-8/Dockerfile
-    dry_run: true
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
     repo: lerentis/ansible
-    tag: debian-8
+    tag: debian-8-${DRONE_COMMIT_SHA}
   when:
     event:
     - push
@@ -101,9 +122,12 @@ steps:
   image: banzaicloud/drone-kaniko
   settings:
     dockerfile: debian-9/Dockerfile
-    dry_run: true
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
     repo: lerentis/ansible
-    tag: debian-9
+    tag: debian-9-${DRONE_COMMIT_SHA}
   when:
     event:
     - push
@@ -113,9 +137,12 @@ steps:
   image: banzaicloud/drone-kaniko
   settings:
     dockerfile: debian-10/Dockerfile
-    dry_run: true
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
     repo: lerentis/ansible
-    tag: debian-10
+    tag: debian-10-${DRONE_COMMIT_SHA}
   when:
     event:
     - push
@@ -125,9 +152,12 @@ steps:
   image: banzaicloud/drone-kaniko
   settings:
     dockerfile: centos-8/Dockerfile
-    dry_run: true
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
     repo: lerentis/ansible
-    tag: centos-8
+    tag: centos-8-${DRONE_COMMIT_SHA}
   when:
     event:
     - push
@@ -137,9 +167,12 @@ steps:
   image: banzaicloud/drone-kaniko
   settings:
     dockerfile: centos-7/Dockerfile
-    dry_run: true
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
     repo: lerentis/ansible
-    tag: centos-7
+    tag: centos-7-${DRONE_COMMIT_SHA}
   when:
     event:
     - push
@@ -149,7 +182,190 @@ steps:
   image: banzaicloud/drone-kaniko
   settings:
     dockerfile: arch/Dockerfile
-    dry_run: true
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
+    repo: lerentis/ansible
+    tag: arch-${DRONE_COMMIT_SHA}
+  when:
+    event:
+    - push
+    - pull_request
+
+- name: build-ubuntu-20-release
+  image: banzaicloud/drone-kaniko
+  settings:
+    dockerfile: ubuntu-20.04/Dockerfile
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
+    repo: lerentis/ansible
+    tag: ubuntu-20.04
+  when:
+    event:
+    - push
+    - pull_request
+
+- name: build-ubuntu-18-release
+  image: banzaicloud/drone-kaniko
+  settings:
+    dockerfile: ubuntu-18.04/Dockerfile
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
+    repo: lerentis/ansible
+    tag: ubuntu-18.04
+  when:
+    event:
+    - push
+    - pull_request
+
+- name: build-ubuntu-16-release
+  image: banzaicloud/drone-kaniko
+  settings:
+    dockerfile: ubuntu-16.04/Dockerfile
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
+    repo: lerentis/ansible
+    tag: ubuntu-16.04
+  when:
+    event:
+    - push
+    - pull_request
+
+- name: build-ubuntu-14-release
+  image: banzaicloud/drone-kaniko
+  settings:
+    dockerfile: ubuntu-14.04/Dockerfile
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
+    repo: lerentis/ansible
+    tag: ubuntu-14.04
+  when:
+    event:
+    - push
+    - pull_request
+
+- name: build-fedora-24-release
+  image: banzaicloud/drone-kaniko
+  settings:
+    dockerfile: fedora-24/Dockerfile
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
+    repo: lerentis/ansible
+    tag: fedora-24
+  when:
+    event:
+    - push
+    - pull_request
+
+- name: build-alpine-3-release
+  image: banzaicloud/drone-kaniko
+  settings:
+    dockerfile: alpine-3/Dockerfile
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
+    repo: lerentis/ansible
+    tag: alpine-3
+  when:
+    event:
+    - push
+    - pull_request
+
+- name: build-debian-8-release
+  image: banzaicloud/drone-kaniko
+  settings:
+    dockerfile: debian-8/Dockerfile
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
+    repo: lerentis/ansible
+    tag: debian-8
+  when:
+    event:
+    - push
+    - pull_request
+
+- name: build-debian-9-release
+  image: banzaicloud/drone-kaniko
+  settings:
+    dockerfile: debian-9/Dockerfile
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
+    repo: lerentis/ansible
+    tag: debian-9
+  when:
+    event:
+    - push
+    - pull_request
+
+- name: build-debian-10-release
+  image: banzaicloud/drone-kaniko
+  settings:
+    dockerfile: debian-10/Dockerfile
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
+    repo: lerentis/ansible
+    tag: debian-10
+  when:
+    event:
+    - push
+    - pull_request
+
+- name: build-centos-8-release
+  image: banzaicloud/drone-kaniko
+  settings:
+    dockerfile: centos-8/Dockerfile
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
+    repo: lerentis/ansible
+    tag: centos-8
+  when:
+    event:
+    - push
+    - pull_request
+
+- name: build-centos-7-release
+  image: banzaicloud/drone-kaniko
+  settings:
+    dockerfile: centos-7/Dockerfile
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
+    repo: lerentis/ansible
+    tag: centos-7
+  when:
+    event:
+    - push
+    - pull_request
+
+- name: build-arch-release
+  image: banzaicloud/drone-kaniko
+  settings:
+    dockerfile: arch/Dockerfile
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
     repo: lerentis/ansible
     tag: arch
   when:
@@ -157,173 +373,6 @@ steps:
     - push
     - pull_request
 
-- name: build-ubuntu-18-publish
-  image: banzaicloud/drone-kaniko
-  settings:
-    dockerfile: ubuntu-18.04/Dockerfile
-    password:
-      from_secret: docker_password
-    repo: lerentis/ansible
-    tag: ubuntu-18.04
-    username:
-      from_secret: docker_username
-  when:
-    event:
-    - tag
-
-- name: build-ubuntu-20-publish
-  image: banzaicloud/drone-kaniko
-  settings:
-    dockerfile: ubuntu-20.04/Dockerfile
-    password:
-      from_secret: docker_password
-    repo: lerentis/ansible
-    tag: ubuntu-20.04
-    username:
-      from_secret: docker_username
-  when:
-    event:
-    - tag
-
-- name: build-ubuntu-16-publish
-  image: banzaicloud/drone-kaniko
-  settings:
-    dockerfile: ubuntu-16.04/Dockerfile
-    password:
-      from_secret: docker_password
-    repo: lerentis/ansible
-    tag: ubuntu-16.04
-    username:
-      from_secret: docker_username
-  when:
-    event:
-    - tag
-
-- name: build-ubuntu-14-publish
-  image: banzaicloud/drone-kaniko
-  settings:
-    dockerfile: ubuntu-14.04/Dockerfile
-    password:
-      from_secret: docker_password
-    repo: lerentis/ansible
-    tag: ubuntu-14.04
-    username:
-      from_secret: docker_username
-  when:
-    event:
-    - tag
-
-- name: build-fedora-24-publish
-  image: banzaicloud/drone-kaniko
-  settings:
-    dockerfile: fedora-24/Dockerfile
-    password:
-      from_secret: docker_password
-    repo: lerentis/ansible
-    tag: fedora-24
-    username:
-      from_secret: docker_username
-  when:
-    event:
-    - tag
-
-- name: build-alpine-3-publish
-  image: banzaicloud/drone-kaniko
-  settings:
-    dockerfile: alpine-3/Dockerfile
-    password:
-      from_secret: docker_password
-    repo: lerentis/ansible
-    tag: alpine-3
-    username:
-      from_secret: docker_username
-  when:
-    event:
-    - tag
-
-- name: build-debian-8-publish
-  image: banzaicloud/drone-kaniko
-  settings:
-    dockerfile: debian-8/Dockerfile
-    password:
-      from_secret: docker_password
-    repo: lerentis/ansible
-    tag: debian-8
-    username:
-      from_secret: docker_username
-  when:
-    event:
-    - tag
-
-- name: build-debian-9-publish
-  image: banzaicloud/drone-kaniko
-  settings:
-    dockerfile: debian-9/Dockerfile
-    password:
-      from_secret: docker_password
-    repo: lerentis/ansible
-    tag: debian-9
-    username:
-      from_secret: docker_username
-  when:
-    event:
-    - tag
-
-- name: build-debian-10-publish
-  image: banzaicloud/drone-kaniko
-  settings:
-    dockerfile: debian-10/Dockerfile
-    password:
-      from_secret: docker_password
-    repo: lerentis/ansible
-    tag: debian-10
-    username:
-      from_secret: docker_username
-  when:
-    event:
-    - tag
-
-- name: build-centos-7-publish
-  image: banzaicloud/drone-kaniko
-  settings:
-    dockerfile: centos-7/Dockerfile
-    password:
-      from_secret: docker_password
-    repo: lerentis/ansible
-    tag: centos-7
-    username:
-      from_secret: docker_username
-  when:
-    event:
-    - tag
-
-- name: build-centos-8-publish
-  image: banzaicloud/drone-kaniko
-  settings:
-    dockerfile: centos-8/Dockerfile
-    password:
-      from_secret: docker_password
-    repo: lerentis/ansible
-    tag: centos-8
-    username:
-      from_secret: docker_username
-  when:
-    event:
-    - tag
-
-- name: build-arch-publish
-  image: banzaicloud/drone-kaniko
-  settings:
-    dockerfile: arch/Dockerfile
-    password:
-      from_secret: docker_password
-    repo: lerentis/ansible
-    tag: arch
-    username:
-      from_secret: docker_username
-  when:
-    event:
-    - tag
 
 - name: notify
   image: appleboy/drone-telegram
@@ -348,15 +397,3 @@ steps:
   - build-centos-7
   - build-centos-8
   - build-arch
-  - build-ubuntu-20-publish
-  - build-ubuntu-18-publish
-  - build-ubuntu-16-publish
-  - build-ubuntu-14-publish
-  - build-fedora-24-publish
-  - build-alpine-3-publish
-  - build-debian-8-publish
-  - build-debian-9-publish
-  - build-debian-10-publish
-  - build-centos-7-publish
-  - build-centos-8-publish
-  - build-arch-publish