diff --git a/.drone.yml b/.drone.yml
index 29f9534..6b410cf 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,216 +1,251 @@
-pipeline:
+---
+kind: pipeline
+name: ansible-containers
 
-  build-ubuntu-18:
-    group: build
+concurrency:
+  limit: 9
+
+steps:
+  - name: build-ubuntu-18
     image: plugins/docker
-    repo: lerentis/ansible
-    tag: ubuntu-18.04
-    dockerfile: ubuntu-18.04/Dockerfile
-    dry_run: true
+    settings:
+      dockerfile: ubuntu-18.04/Dockerfile
+      dry_run: true
+      repo: lerentis/ansible
+      tag: ubuntu-18.04
     when:
-      event: [ push, pull_request ]
+      event:
+      - push
+      - pull_request
 
-  build-ubuntu-16:
-    group: build
+  - name: build-ubuntu-16
     image: plugins/docker
-    repo: lerentis/ansible
-    tag: ubuntu-16.04
-    dockerfile: ubuntu-16.04/Dockerfile
-    dry_run: true
+    settings:
+      dockerfile: ubuntu-16.04/Dockerfile
+      dry_run: true
+      repo: lerentis/ansible
+      tag: ubuntu-16.04
     when:
-      event: [ push, pull_request ]
+      event:
+      - push
+      - pull_request
 
-  build-ubuntu-14:
-    group: build
+  - name: build-ubuntu-14
     image: plugins/docker
-    repo: lerentis/ansible
-    tag: ubuntu-14.04
-    dockerfile: ubuntu-14.04/Dockerfile
-    dry_run: true
+    settings:
+      dockerfile: ubuntu-14.04/Dockerfile
+      dry_run: true
+      repo: lerentis/ansible
+      tag: ubuntu-14.04
     when:
-      event: [ push, pull_request ]
+      event:
+      - push
+      - pull_request
 
-  build-fedora-24:
-    group: build
+  - name: build-fedora-24
     image: plugins/docker
-    repo: lerentis/ansible
-    tag: fedora-24
-    dockerfile: fedora-24/Dockerfile
-    dry_run: true
+    settings:
+      dockerfile: fedora-24/Dockerfile
+      dry_run: true
+      repo: lerentis/ansible
+      tag: fedora-24
     when:
-      event: [ push, pull_request ]
+      event:
+      - push
+      - pull_request
 
-  build-alpine-3:
-    group: build
+  - name: build-alpine-3
     image: plugins/docker
-    repo: lerentis/ansible
-    tag: alpine-3
-    dockerfile: alpine-3/Dockerfile
-    dry_run: true
+    settings:
+      dockerfile: alpine-3/Dockerfile
+      dry_run: true
+      repo: lerentis/ansible
+      tag: alpine-3
     when:
-      event: [ push, pull_request ]
+      event:
+      - push
+      - pull_request
 
-  build-debian-8:
-    group: build
+  - image: plugins/docker
+    settings:
+      dockerfile: debian-8/Dockerfile
+      dry_run: true
+      repo: lerentis/ansible
+      tag: debian-8
+    when:
+      event:
+      - push
+      - pull_request
+
+  - name: build-debian-7
     image: plugins/docker
-    repo: lerentis/ansible
-    tag: debian-8
-    dockerfile: debian-8/Dockerfile
-    dry_run: true
+    settings:
+      dockerfile: debian-8/Dockerfile
+      dry_run: true
+      repo: lerentis/ansible
+      tag: debian-7
     when:
-      event: [ push, pull_request ]
+      event:
+      - push
+      - pull_request
 
-  build-debian-7:
-    group: build
+  - name: build-centos-7
     image: plugins/docker
-    repo: lerentis/ansible
-    tag: debian-7
-    dockerfile: debian-8/Dockerfile
-    dry_run: true
+    settings:
+      dockerfile: centos-7/Dockerfile
+      dry_run: true
+      repo: lerentis/ansible
+      tag: centos-7
     when:
-      event: [ push, pull_request ]
+      event:
+      - push
+      - pull_request
 
-  build-centos-7:
-    group: build
+  - name: build-arch
     image: plugins/docker
-    repo: lerentis/ansible
-    tag: centos-7
-    dockerfile: centos-7/Dockerfile
-    dry_run: true
+    settings:
+      dockerfile: arch/Dockerfile
+      dry_run: true
+      repo: lerentis/ansible
+      tag: arch
     when:
-      event: [ push, pull_request ]
+      event:
+      - push
+      - pull_request
 
-  build-arch:
-    group: build
+  - name: build-ubuntu-18-publish
     image: plugins/docker
-    repo: lerentis/ansible
-    tag: arch
-    dockerfile: arch/Dockerfile
-    dry_run: true
+    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: [ push, pull_request ]
+      event:
+      - tag
 
-  build-ubuntu-18-publish:
-    group: release
+  - name: build-ubuntu-16-publish
     image: plugins/docker
-    repo: lerentis/ansible
-    tag: ubuntu-18.04
-    dockerfile: ubuntu-18.04/Dockerfile
-    username:
-      from_secret: docker_username
-    password:
-      from_secret: docker_password
+    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 ]
+      event:
+      - tag
 
-  build-ubuntu-16-publish:
-    group: release
+  - name: build-ubuntu-14-publish
     image: plugins/docker
-    repo: lerentis/ansible
-    tag: ubuntu-16.04
-    dockerfile: ubuntu-16.04/Dockerfile
-    username:
-      from_secret: docker_username
-    password:
-      from_secret: docker_password
+    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 ]
+      event:
+      - tag
 
-  build-ubuntu-14-publish:
-    group: release
+  - name: build-fedora-24-publish
     image: plugins/docker
-    repo: lerentis/ansible
-    tag: ubuntu-14.04
-    dockerfile: ubuntu-14.04/Dockerfile
-    username:
-      from_secret: docker_username
-    password:
-      from_secret: docker_password
+    settings:
+      dockerfile: fedora-24/Dockerfile
+      password:
+        from_secret: docker_password
+      repo: lerentis/ansible
+      tag: fedora-24
+      username:
+        from_secret: docker_username
     when:
-      event: [ tag ]
+      event:
+      - tag
 
-  build-fedora-24-publish:
-    group: release
+  - name: build-alpine-3-publish
     image: plugins/docker
-    repo: lerentis/ansible
-    tag: fedora-24
-    dockerfile: fedora-24/Dockerfile
-    username:
-      from_secret: docker_username
-    password:
-      from_secret: docker_password
+    settings:
+      dockerfile: alpine-3/Dockerfile
+      password:
+        from_secret: docker_password
+      repo: lerentis/ansible
+      tag: alpine-3
+      username:
+        from_secret: docker_username
     when:
-      event: [ tag ]
+      event:
+      - tag
 
-  build-alpine-3-publish:
-    group: release
+  - name: build-debian-8-publish
     image: plugins/docker
-    repo: lerentis/ansible
-    tag: alpine-3
-    dockerfile: alpine-3/Dockerfile
-    username:
-      from_secret: docker_username
-    password:
-      from_secret: docker_password
+    settings:
+      dockerfile: debian-8/Dockerfile
+      password:
+        from_secret: docker_password
+      repo: lerentis/ansible
+      tag: debian-8
+      username:
+        from_secret: docker_username
     when:
-      event: [ tag ]
+      event:
+      - tag
 
-  build-debian-8-publish:
-    group: release
+  - name: build-debian-7-publish
     image: plugins/docker
-    repo: lerentis/ansible
-    tag: debian-8
-    dockerfile: debian-8/Dockerfile
-    username:
-      from_secret: docker_username
-    password:
-      from_secret: docker_password
+    settings:
+      dockerfile: debian-8/Dockerfile
+      password:
+        from_secret: docker_password
+      repo: lerentis/ansible
+      tag: debian-7
+      username:
+        from_secret: docker_username
     when:
-      event: [ tag ]
+      event:
+      - tag
 
-  build-debian-7-publish:
-    group: release
+  - name: build-centos-7-publish
     image: plugins/docker
-    repo: lerentis/ansible
-    tag: debian-7
-    dockerfile: debian-8/Dockerfile
-    username:
-      from_secret: docker_username
-    password:
-      from_secret: docker_password
+    settings:
+      dockerfile: centos-7/Dockerfile
+      password:
+        from_secret: docker_password
+      repo: lerentis/ansible
+      tag: centos-7
+      username:
+        from_secret: docker_username
     when:
-      event: [ tag ]
+      event:
+      - tag
 
-  build-centos-7-publish:
-    group: release
+  - name: build-arch-publish
     image: plugins/docker
-    repo: lerentis/ansible
-    tag: centos-7
-    dockerfile: centos-7/Dockerfile
-    username:
-      from_secret: docker_username
-    password:
-      from_secret: docker_password
+    settings:
+      dockerfile: arch/Dockerfile
+      password:
+        from_secret: docker_password
+      repo: lerentis/ansible
+      tag: arch
+      username:
+        from_secret: docker_username
     when:
-      event: [ tag ]
+      event:
+      - tag
 
-  build-arch-publish:
-    group: release
-    image: plugins/docker
-    repo: lerentis/ansible
-    tag: arch
-    dockerfile: arch/Dockerfile
-    username:
-      from_secret: docker_username
-    password:
-      from_secret: docker_password
-    when:
-      event: [ tag ]
-
-  telegram:
-      image: appleboy/drone-telegram
-      token: 335668211:AAF-YgId7iI6ANBuZVy4uVOYYqA4R4uAaqY
+  - name: notify
+    image: appleboy/drone-telegram
+    settings:
+      message: "Commit {{ commit.link }} ran with build {{ build.number }} and finished with status {{ build.status }}."
       to: 14852963
-      message: Commit {{ commit.link }} ran with build {{ build.number }} and finished with status {{ build.status }}.
-      when:
-        status:  [ failure, success ]
+      token: 335668211:AAF-YgId7iI6ANBuZVy4uVOYYqA4R4uAaqY
+    when:
+      status:
+      - failure
+      - success