diff --git a/.drone.yml b/.drone.yml
index d8b849d7861..55dd0893c30 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -240,6 +240,9 @@ services:
     MYSQL_ROOT_PASSWORD: rootpass
     MYSQL_USER: grafana
 
+node:
+  type: no-parallel
+
 trigger:
   event:
   - pull_request
@@ -573,6 +576,9 @@ services:
     MYSQL_ROOT_PASSWORD: rootpass
     MYSQL_USER: grafana
 
+node:
+  type: no-parallel
+
 trigger:
   branch:
   - master
@@ -673,6 +679,9 @@ steps:
   depends_on:
   - initialize
 
+node:
+  type: no-parallel
+
 trigger:
   branch:
   - master
@@ -1020,6 +1029,9 @@ services:
     MYSQL_ROOT_PASSWORD: rootpass
     MYSQL_USER: grafana
 
+node:
+  type: no-parallel
+
 trigger:
   ref:
   - refs/tags/v*
@@ -1461,6 +1473,9 @@ services:
     MYSQL_ROOT_PASSWORD: rootpass
     MYSQL_USER: grafana
 
+node:
+  type: no-parallel
+
 trigger:
   ref:
   - refs/tags/v*
@@ -1598,6 +1613,9 @@ steps:
   depends_on:
   - initialize
 
+node:
+  type: no-parallel
+
 trigger:
   ref:
   - refs/tags/v*
@@ -1934,6 +1952,9 @@ services:
     MYSQL_ROOT_PASSWORD: rootpass
     MYSQL_USER: grafana
 
+node:
+  type: no-parallel
+
 trigger:
   event:
   - custom
@@ -2369,6 +2390,9 @@ services:
     MYSQL_ROOT_PASSWORD: rootpass
     MYSQL_USER: grafana
 
+node:
+  type: no-parallel
+
 trigger:
   event:
   - custom
@@ -2506,6 +2530,9 @@ steps:
   depends_on:
   - initialize
 
+node:
+  type: no-parallel
+
 trigger:
   event:
   - custom
@@ -2817,6 +2844,9 @@ services:
     MYSQL_ROOT_PASSWORD: rootpass
     MYSQL_USER: grafana
 
+node:
+  type: no-parallel
+
 trigger:
   ref:
   - refs/heads/v*
@@ -3251,6 +3281,9 @@ services:
     MYSQL_ROOT_PASSWORD: rootpass
     MYSQL_USER: grafana
 
+node:
+  type: no-parallel
+
 trigger:
   ref:
   - refs/heads/v*
diff --git a/scripts/lib.star b/scripts/lib.star
index f3b924d2572..e115fe363cb 100644
--- a/scripts/lib.star
+++ b/scripts/lib.star
@@ -26,9 +26,11 @@ def pipeline(
         }
     else:
         platform_conf = {
-            'os': 'windows',
-            'arch': 'amd64',
-            'version': '1809',
+            'platform': {
+                'os': 'windows',
+                'arch': 'amd64',
+                'version': '1809',
+            }
         }
 
     pipeline = {
@@ -43,6 +45,7 @@ def pipeline(
         ) + steps,
         'depends_on': depends_on,
     }
+    pipeline.update(platform_conf)
 
     if edition in ('enterprise', 'enterprise2'):
         # We have a custom clone step for enterprise