diff --git a/.drone.yml b/.drone.yml
index dc63366..d9b7ddf 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,90 +1,121 @@
 ---
-kind: pipeline
-name: centos7
-
-
-matrix:
-  DISTRO:
-    - centos7
-    - debian10
-    - debian11
-
-services:
-- name: docker
-  image: docker:dind
-  privileged: true
+- kind: pipeline
+  name: Test on centos7
+  services:
+  - image: docker:dind
+    name: docker
+    privileged: true
+    volumes:
+      name: dockersock
+      path: /var/run
+  steps:
+  - - commands:
+      - sleep 10
+      - mkdir ${DRONE_REPO_NAME}
+      - rsync -a . ${DRONE_REPO_NAME} --exclude ${DRONE_REPO_NAME}
+      - cd ${DRONE_REPO_NAME}
+      - molecule test
+      environment:
+        MOLECULE_DISTRO: centos7
+      image: guisea/ansible-molecule:latest
+      name: Test on centos7
+      volumes:
+        name: dockersock
+        path: /var/run
+    - image: drillster/drone-email
+      name: notify by email
+      settings:
+        from: drone@guise.net.nz
+        host: mail.guise.net.nz
+        password:
+          from_secret: EMAIL_PASS
+        username:
+          from_secret: EMAIL_USER
+      when:
+        status:
+        - changed
+        - failure
+  type: docker
   volumes:
-  - name: dockersock
-    path: /var/run
-
-volumes:
-- name: dockersock
-  temp: {}
-
-steps:
-- name: Test with Molecule centos7
-  image: guisea/ansible-molecule:latest
+    name: dockersock
+    temp: {}
+- kind: pipeline
+  name: Test on debian10
+  services:
+  - image: docker:dind
+    name: docker
+    privileged: true
+    volumes:
+      name: dockersock
+      path: /var/run
+  steps:
+  - - commands:
+      - sleep 10
+      - mkdir ${DRONE_REPO_NAME}
+      - rsync -a . ${DRONE_REPO_NAME} --exclude ${DRONE_REPO_NAME}
+      - cd ${DRONE_REPO_NAME}
+      - molecule test
+      environment:
+        MOLECULE_DISTRO: debian10
+      image: guisea/ansible-molecule:latest
+      name: Test on debian10
+      volumes:
+        name: dockersock
+        path: /var/run
+    - image: drillster/drone-email
+      name: notify by email
+      settings:
+        from: drone@guise.net.nz
+        host: mail.guise.net.nz
+        password:
+          from_secret: EMAIL_PASS
+        username:
+          from_secret: EMAIL_USER
+      when:
+        status:
+        - changed
+        - failure
+  type: docker
   volumes:
-  - name: dockersock
-    path: /var/run
-  commands:
-  - sleep 10 # give docker enough time to start
-  - mkdir ${DRONE_REPO_NAME}
-  - rsync -a . ${DRONE_REPO_NAME} --exclude ${DRONE_REPO_NAME}
-  - cd ${DRONE_REPO_NAME}
-  - molecule test
-  environment:
-    MOLECULE_DISTRO: centos7
-- name: notify by email
-  image: drillster/drone-email
-  settings:
-    host: mail.guise.net.nz
-    username:
-      from_secret: EMAIL_USER
-    password:
-      from_secret: EMAIL_PASS
-    from: drone@guise.net.nz
-  when:
-    status: [ changed, failure ]
-
----
-kind: pipeline
-name: debian10
-
-services:
-- name: docker
-  image: docker:dind
-  privileged: true
+    name: dockersock
+    temp: {}
+- kind: pipeline
+  name: Test on debian11
+  services:
+  - image: docker:dind
+    name: docker
+    privileged: true
+    volumes:
+      name: dockersock
+      path: /var/run
+  steps:
+  - - commands:
+      - sleep 10
+      - mkdir ${DRONE_REPO_NAME}
+      - rsync -a . ${DRONE_REPO_NAME} --exclude ${DRONE_REPO_NAME}
+      - cd ${DRONE_REPO_NAME}
+      - molecule test
+      environment:
+        MOLECULE_DISTRO: debian11
+      image: guisea/ansible-molecule:latest
+      name: Test on debian11
+      volumes:
+        name: dockersock
+        path: /var/run
+    - image: drillster/drone-email
+      name: notify by email
+      settings:
+        from: drone@guise.net.nz
+        host: mail.guise.net.nz
+        password:
+          from_secret: EMAIL_PASS
+        username:
+          from_secret: EMAIL_USER
+      when:
+        status:
+        - changed
+        - failure
+  type: docker
   volumes:
-  - name: dockersock
-    path: /var/run
-
-volumes:
-- name: dockersock
-  temp: {}
-
-steps:
-- name: Test with Molecule debian10
-  image: guisea/ansible-molecule:latest
-  volumes:
-  - name: dockersock
-    path: /var/run
-  commands:
-  - sleep 10 # give docker enough time to start
-  - mkdir ${DRONE_REPO_NAME}
-  - rsync -a . ${DRONE_REPO_NAME} --exclude ${DRONE_REPO_NAME}
-  - cd ${DRONE_REPO_NAME}
-  - molecule test
-  environment:
-    MOLECULE_DISTRO: debian10
-- name: notify by email
-  image: drillster/drone-email
-  settings:
-    host: mail.guise.net.nz
-    username:
-      from_secret: EMAIL_USER
-    password:
-      from_secret: EMAIL_PASS
-    from: drone@guise.net.nz
-  when:
-    status: [ changed, failure ]
+    name: dockersock
+    temp: {}
\ No newline at end of file