diff --git a/.drone.yml b/.drone.yml
index 32bde72..dac746c 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -62,25 +62,6 @@ steps:
         backend-store: 'https://git.makerforce.io/beep/backend-store.git'
         backend-transcription: 'https://git.makerforce.io/beep/backend-transcription.git'
         backend-webrtc: 'https://git.makerforce.io/beep/backend-webrtc.git'
-  - name: docker-test
-    image: plugins/docker
-    settings:
-      registry: registry.makerforce.io
-      repo: registry.makerforce.io/beep/backend-auth
-      context: backend-auth
-      dockerfile: backend-auth/Dockerfile
-      dry_run: true
-      tags:
-        - '${DRONE_SOURCE_BRANCH}'
-      username:
-        from_secret: docker_username
-      password:
-        from_secret: docker_password
-    when:
-      branch:
-        - master
-      event:
-        - pull_request
   - name: docker
     image: plugins/docker
     settings:
@@ -93,14 +74,14 @@ steps:
         from_secret: docker_username
       password:
         from_secret: docker_password
-    when:
-      branch:
-        - master
-      event:
-        - push
-        - tag
-        - promote
-        - rollback
+trigger:
+  branch:
+    - master
+  event:
+    - push
+    - tag
+    - promote
+    - rollback
 ---
 kind: pipeline
 name: backend-core
@@ -121,25 +102,6 @@ steps:
         backend-store: 'https://git.makerforce.io/beep/backend-store.git'
         backend-transcription: 'https://git.makerforce.io/beep/backend-transcription.git'
         backend-webrtc: 'https://git.makerforce.io/beep/backend-webrtc.git'
-  - name: docker-test
-    image: plugins/docker
-    settings:
-      registry: registry.makerforce.io
-      repo: registry.makerforce.io/beep/backend-core
-      context: backend-core
-      dockerfile: backend-core/Dockerfile
-      dry_run: true
-      tags:
-        - '${DRONE_SOURCE_BRANCH}'
-      username:
-        from_secret: docker_username
-      password:
-        from_secret: docker_password
-    when:
-      branch:
-        - master
-      event:
-        - pull_request
   - name: docker
     image: plugins/docker
     settings:
@@ -152,14 +114,14 @@ steps:
         from_secret: docker_username
       password:
         from_secret: docker_password
-    when:
-      branch:
-        - master
-      event:
-        - push
-        - tag
-        - promote
-        - rollback
+trigger:
+  branch:
+    - master
+  event:
+    - push
+    - tag
+    - promote
+    - rollback
 ---
 kind: pipeline
 name: backend-heartbeat
@@ -180,25 +142,6 @@ steps:
         backend-store: 'https://git.makerforce.io/beep/backend-store.git'
         backend-transcription: 'https://git.makerforce.io/beep/backend-transcription.git'
         backend-webrtc: 'https://git.makerforce.io/beep/backend-webrtc.git'
-  - name: docker-test
-    image: plugins/docker
-    settings:
-      registry: registry.makerforce.io
-      repo: registry.makerforce.io/beep/backend-heartbeat
-      context: backend-heartbeat
-      dockerfile: backend-heartbeat/Dockerfile
-      dry_run: true
-      tags:
-        - '${DRONE_SOURCE_BRANCH}'
-      username:
-        from_secret: docker_username
-      password:
-        from_secret: docker_password
-    when:
-      branch:
-        - master
-      event:
-        - pull_request
   - name: docker
     image: plugins/docker
     settings:
@@ -211,14 +154,14 @@ steps:
         from_secret: docker_username
       password:
         from_secret: docker_password
-    when:
-      branch:
-        - master
-      event:
-        - push
-        - tag
-        - promote
-        - rollback
+trigger:
+  branch:
+    - master
+  event:
+    - push
+    - tag
+    - promote
+    - rollback
 ---
 kind: pipeline
 name: backend-login
@@ -239,25 +182,6 @@ steps:
         backend-store: 'https://git.makerforce.io/beep/backend-store.git'
         backend-transcription: 'https://git.makerforce.io/beep/backend-transcription.git'
         backend-webrtc: 'https://git.makerforce.io/beep/backend-webrtc.git'
-  - name: docker-test
-    image: plugins/docker
-    settings:
-      registry: registry.makerforce.io
-      repo: registry.makerforce.io/beep/backend-login
-      context: backend-login
-      dockerfile: backend-login/Dockerfile
-      dry_run: true
-      tags:
-        - '${DRONE_SOURCE_BRANCH}'
-      username:
-        from_secret: docker_username
-      password:
-        from_secret: docker_password
-    when:
-      branch:
-        - master
-      event:
-        - pull_request
   - name: docker
     image: plugins/docker
     settings:
@@ -270,14 +194,14 @@ steps:
         from_secret: docker_username
       password:
         from_secret: docker_password
-    when:
-      branch:
-        - master
-      event:
-        - push
-        - tag
-        - promote
-        - rollback
+trigger:
+  branch:
+    - master
+  event:
+    - push
+    - tag
+    - promote
+    - rollback
 ---
 kind: pipeline
 name: backend-permissions
@@ -298,25 +222,6 @@ steps:
         backend-store: 'https://git.makerforce.io/beep/backend-store.git'
         backend-transcription: 'https://git.makerforce.io/beep/backend-transcription.git'
         backend-webrtc: 'https://git.makerforce.io/beep/backend-webrtc.git'
-  - name: docker-test
-    image: plugins/docker
-    settings:
-      registry: registry.makerforce.io
-      repo: registry.makerforce.io/beep/backend-permissions
-      context: backend-permissions
-      dockerfile: backend-permissions/Dockerfile
-      dry_run: true
-      tags:
-        - '${DRONE_SOURCE_BRANCH}'
-      username:
-        from_secret: docker_username
-      password:
-        from_secret: docker_password
-    when:
-      branch:
-        - master
-      event:
-        - pull_request
   - name: docker
     image: plugins/docker
     settings:
@@ -329,14 +234,14 @@ steps:
         from_secret: docker_username
       password:
         from_secret: docker_password
-    when:
-      branch:
-        - master
-      event:
-        - push
-        - tag
-        - promote
-        - rollback
+trigger:
+  branch:
+    - master
+  event:
+    - push
+    - tag
+    - promote
+    - rollback
 ---
 kind: pipeline
 name: backend-pictures
@@ -357,25 +262,6 @@ steps:
         backend-store: 'https://git.makerforce.io/beep/backend-store.git'
         backend-transcription: 'https://git.makerforce.io/beep/backend-transcription.git'
         backend-webrtc: 'https://git.makerforce.io/beep/backend-webrtc.git'
-  - name: docker-test
-    image: plugins/docker
-    settings:
-      registry: registry.makerforce.io
-      repo: registry.makerforce.io/beep/backend-pictures
-      context: backend-pictures
-      dockerfile: backend-pictures/Dockerfile
-      dry_run: true
-      tags:
-        - '${DRONE_SOURCE_BRANCH}'
-      username:
-        from_secret: docker_username
-      password:
-        from_secret: docker_password
-    when:
-      branch:
-        - master
-      event:
-        - pull_request
   - name: docker
     image: plugins/docker
     settings:
@@ -388,14 +274,14 @@ steps:
         from_secret: docker_username
       password:
         from_secret: docker_password
-    when:
-      branch:
-        - master
-      event:
-        - push
-        - tag
-        - promote
-        - rollback
+trigger:
+  branch:
+    - master
+  event:
+    - push
+    - tag
+    - promote
+    - rollback
 ---
 kind: pipeline
 name: backend-store
@@ -416,25 +302,6 @@ steps:
         backend-store: 'https://git.makerforce.io/beep/backend-store.git'
         backend-transcription: 'https://git.makerforce.io/beep/backend-transcription.git'
         backend-webrtc: 'https://git.makerforce.io/beep/backend-webrtc.git'
-  - name: docker-test
-    image: plugins/docker
-    settings:
-      registry: registry.makerforce.io
-      repo: registry.makerforce.io/beep/backend-store
-      context: backend-store
-      dockerfile: backend-store/Dockerfile
-      dry_run: true
-      tags:
-        - '${DRONE_SOURCE_BRANCH}'
-      username:
-        from_secret: docker_username
-      password:
-        from_secret: docker_password
-    when:
-      branch:
-        - master
-      event:
-        - pull_request
   - name: docker
     image: plugins/docker
     settings:
@@ -447,14 +314,14 @@ steps:
         from_secret: docker_username
       password:
         from_secret: docker_password
-    when:
-      branch:
-        - master
-      event:
-        - push
-        - tag
-        - promote
-        - rollback
+trigger:
+  branch:
+    - master
+  event:
+    - push
+    - tag
+    - promote
+    - rollback
 ---
 kind: pipeline
 name: backend-transcription
@@ -475,25 +342,6 @@ steps:
         backend-store: 'https://git.makerforce.io/beep/backend-store.git'
         backend-transcription: 'https://git.makerforce.io/beep/backend-transcription.git'
         backend-webrtc: 'https://git.makerforce.io/beep/backend-webrtc.git'
-  - name: docker-test
-    image: plugins/docker
-    settings:
-      registry: registry.makerforce.io
-      repo: registry.makerforce.io/beep/backend-transcription
-      context: backend-transcription
-      dockerfile: backend-transcription/Dockerfile
-      dry_run: true
-      tags:
-        - '${DRONE_SOURCE_BRANCH}'
-      username:
-        from_secret: docker_username
-      password:
-        from_secret: docker_password
-    when:
-      branch:
-        - master
-      event:
-        - pull_request
   - name: docker
     image: plugins/docker
     settings:
@@ -506,14 +354,14 @@ steps:
         from_secret: docker_username
       password:
         from_secret: docker_password
-    when:
-      branch:
-        - master
-      event:
-        - push
-        - tag
-        - promote
-        - rollback
+trigger:
+  branch:
+    - master
+  event:
+    - push
+    - tag
+    - promote
+    - rollback
 ---
 kind: pipeline
 name: backend-webrtc
@@ -534,25 +382,6 @@ steps:
         backend-store: 'https://git.makerforce.io/beep/backend-store.git'
         backend-transcription: 'https://git.makerforce.io/beep/backend-transcription.git'
         backend-webrtc: 'https://git.makerforce.io/beep/backend-webrtc.git'
-  - name: docker-test
-    image: plugins/docker
-    settings:
-      registry: registry.makerforce.io
-      repo: registry.makerforce.io/beep/backend-webrtc
-      context: backend-webrtc
-      dockerfile: backend-webrtc/Dockerfile
-      dry_run: true
-      tags:
-        - '${DRONE_SOURCE_BRANCH}'
-      username:
-        from_secret: docker_username
-      password:
-        from_secret: docker_password
-    when:
-      branch:
-        - master
-      event:
-        - pull_request
   - name: docker
     image: plugins/docker
     settings:
@@ -565,14 +394,14 @@ steps:
         from_secret: docker_username
       password:
         from_secret: docker_password
-    when:
-      branch:
-        - master
-      event:
-        - push
-        - tag
-        - promote
-        - rollback
+trigger:
+  branch:
+    - master
+  event:
+    - push
+    - tag
+    - promote
+    - rollback
 ---
 kind: pipeline
 name: deploy
diff --git a/drone_gen.js b/drone_gen.js
index c84d5ce..2f1d1db 100644
--- a/drone_gen.js
+++ b/drone_gen.js
@@ -31,30 +31,6 @@ const yamls = dockers.map(f => ({
 				submodule_override,
 			},
 		},
-		{
-			name: 'docker-test',
-			image: 'plugins/docker',
-			settings: {
-				registry: 'registry.makerforce.io',
-				repo: 'registry.makerforce.io/beep/' + f,
-				context: f,
-				dockerfile: f + '/Dockerfile',
-				dry_run: true, // DISABLE TO PUSH TAGS
-				tags: [
-					'${DRONE_SOURCE_BRANCH}',
-				],
-				username: {
-					from_secret: 'docker_username',
-				},
-				password: {
-					from_secret: 'docker_password',
-				},
-			},
-			when: {
-				branch: ["master"],
-				event: ["pull_request"],
-			},
-		},
 		{
 			name: 'docker',
 			image: 'plugins/docker',
@@ -71,12 +47,12 @@ const yamls = dockers.map(f => ({
 					from_secret: 'docker_password',
 				},
 			},
-			when: {
-				branch: ["master"],
-				event: ["push", "tag", "promote", "rollback"],
-			},
 		},
 	],
+	trigger: {
+		branch: ["master"],
+		event: ["push", "tag", "promote", "rollback"],
+	},
 }))
 
 const sshTest = {