diff --git a/.drone.jsonnet b/.drone.jsonnet
index 4c9e602..b2afb84 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -5,14 +5,6 @@ local packages = ['debian-stable','debian-testing','debian-stable-build-essentia
 local apps = ['apt-cacher-ng', 'curl', 'mosquitto', 'mosquitto-prometheus-exporter'];
 
 local build(dir, package) = {
-    kind: 'pipeline',
-    type: 'docker',
-    name: '%(dir)s-%(package)s' % { dir: dir, package: package },
-    platform: {
-       os: 'linux',
-       arch: 'arm64'
-    },
-    steps: [ {
     name: '%(package)s' % { package: package },
     image: 'plugins/docker',
     settings: { 
@@ -23,17 +15,41 @@ local build(dir, package) = {
         tags: ['latest'],
         repo: 'cr.wks/%(package)s' % { package: package }
      }
-    }]
 };
 
+kind: 'pipeline',
+type: 'docker',
+name: '_CI-CD',
+platform: {
+    os: 'linux',
+    arch: 'arm64'
+},
+    steps: [ {
+
 std.flattenArrays([ [
       build('_CI-CD', pkg)
         for pkg in packages
       
-      ] + [
-      build('apps', app)
-        for app in apps
       ]
-
 ])
 
+}]
+
+
+kind: 'pipeline',
+type: 'docker',
+name: 'apps',
+platform: {
+    os: 'linux',
+    arch: 'arm64'
+},
+    steps: [ {
+
+std.flattenArrays([ [
+      build('apps', app)
+        for app in apps
+      
+      ]
+])
+
+}]