diff --git a/.drone.jsonnet b/.drone.jsonnet
index 132766cdc..2d9f752c6 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -7,7 +7,7 @@ local build_channel = "zerotier-builds";
 local release_channel = "zerotier-releases";
 
 local targets = [
-    { "os": "linux", distro: "redhat", "name": "el9",      "isas": [                 "amd64", "arm64", "ppc64le", "s390x" ],                        "events": [ "tag", "custom" ] },
+    // { "os": "linux", distro: "redhat", "name": "el9",      "isas": [                 "amd64", "arm64", "ppc64le", "s390x" ],                        "events": [ "tag", "custom" ] },
     // { "os": "linux", distro: "redhat", "name": "el8",      "isas": [                 "amd64", "arm64", "ppc64le", "s390x" ],                        "events": [ "tag" ] },
     // { "os": "linux", distro: "redhat", "name": "el7",      "isas": [ "386",          "amd64",          "ppc64le"],                                  "events": [ "tag" ] },
     // { "os": "linux", distro: "amazon", "name": "amzn2",    "isas": [                 "amd64", "arm64" ],                                            "events": [ "tag" ] },
@@ -26,8 +26,8 @@ local targets = [
     // { "os": "linux", distro: "debian", "name": "stretch",  "isas": [ "386", "armv7", "amd64", "arm64" ],                                            "events": [ "tag" ] },
     // { "os": "linux", distro: "debian", "name": "jessie",   "isas": [ "386", "armv7", "amd64" ],                                                     "events": [ "tag" ] },
 
- // { "os": "linux", distro: "redhat", "name": "el9",      "isas": [ "amd64" ],  "events": [ "push", "tag", "custom" ] },
- // { "os": "linux", distro: "ubuntu", "name": "jammy",    "isas": [ "amd64" ],  "events": [ "push", "tag", "custom" ] },
+    { "os": "linux", distro: "redhat", "name": "el9",      "isas": [ "amd64" ],  "events": [ "push", "tag", "custom" ] },
+    { "os": "linux", distro: "ubuntu", "name": "jammy",    "isas": [ "amd64" ],  "events": [ "push", "tag", "custom" ] },
  // { "os": "windows", distro: "windows", "name": "windows",  "isas": [ "amd64" ], "events": [ "push", "tag", "custom" ] },
  // { "os": "darwin", distro: "darwin", "name": "darwin",  "isas": [ "amd64" ], "events": [ "push", "tag", "custom" ] },
 
diff --git a/.drone.yml b/.drone.yml
index ae481cbdb..d9c265920 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -43,172 +43,7 @@ steps:
     - tag
 trigger:
   event:
-  - tag
-  - custom
-type: docker
-volumes:
-- host:
-    path: /zerotier-builds
-  name: zerotier-builds
-- host:
-    path: /zerotier-releases
-  name: zerotier-releases
----
-clone:
-  depth: 1
-kind: pipeline
-name: el9 arm64 build
-platform:
-  arch: arm64
-  os: linux
-pull: always
-steps:
-- commands:
-  - ./ci/scripts/build.sh el9 redhat arm64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT}
-  image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder
-  name: build
-  when:
-    event:
-    - push
-- commands:
-  - ./ci/scripts/build.sh el9 redhat arm64 ${DRONE_TAG} ${DRONE_BUILD_EVENT}
-  image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder
-  name: release
-  when:
-    event:
-    - tag
-- commands:
-  - ./ci/scripts/publish.sh el9 redhat arm64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT}
-  image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder
-  name: copy build
-  volumes:
-  - name: zerotier-builds
-    path: /zerotier-builds
-  when:
-    event:
-    - push
-- commands:
-  - ./ci/scripts/publish.sh el9 redhat arm64 ${DRONE_TAG} ${DRONE_BUILD_EVENT}
-  image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder
-  name: copy relase
-  volumes:
-  - name: zerotier-releases
-    path: /zerotier-releases
-  when:
-    event:
-    - tag
-trigger:
-  event:
-  - tag
-  - custom
-type: docker
-volumes:
-- host:
-    path: /zerotier-builds
-  name: zerotier-builds
-- host:
-    path: /zerotier-releases
-  name: zerotier-releases
----
-clone:
-  depth: 1
-kind: pipeline
-name: el9 ppc64le build
-platform:
-  os: linux
-pull: always
-steps:
-- commands:
-  - ./ci/scripts/build.sh el9 redhat ppc64le 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT}
-  image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder
-  name: build
-  when:
-    event:
-    - push
-- commands:
-  - ./ci/scripts/build.sh el9 redhat ppc64le ${DRONE_TAG} ${DRONE_BUILD_EVENT}
-  image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder
-  name: release
-  when:
-    event:
-    - tag
-- commands:
-  - ./ci/scripts/publish.sh el9 redhat ppc64le 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT}
-  image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder
-  name: copy build
-  volumes:
-  - name: zerotier-builds
-    path: /zerotier-builds
-  when:
-    event:
-    - push
-- commands:
-  - ./ci/scripts/publish.sh el9 redhat ppc64le ${DRONE_TAG} ${DRONE_BUILD_EVENT}
-  image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder
-  name: copy relase
-  volumes:
-  - name: zerotier-releases
-    path: /zerotier-releases
-  when:
-    event:
-    - tag
-trigger:
-  event:
-  - tag
-  - custom
-type: docker
-volumes:
-- host:
-    path: /zerotier-builds
-  name: zerotier-builds
-- host:
-    path: /zerotier-releases
-  name: zerotier-releases
----
-clone:
-  depth: 1
-kind: pipeline
-name: el9 s390x build
-platform:
-  os: linux
-pull: always
-steps:
-- commands:
-  - ./ci/scripts/build.sh el9 redhat s390x 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT}
-  image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder
-  name: build
-  when:
-    event:
-    - push
-- commands:
-  - ./ci/scripts/build.sh el9 redhat s390x ${DRONE_TAG} ${DRONE_BUILD_EVENT}
-  image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder
-  name: release
-  when:
-    event:
-    - tag
-- commands:
-  - ./ci/scripts/publish.sh el9 redhat s390x 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT}
-  image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder
-  name: copy build
-  volumes:
-  - name: zerotier-builds
-    path: /zerotier-builds
-  when:
-    event:
-    - push
-- commands:
-  - ./ci/scripts/publish.sh el9 redhat s390x ${DRONE_TAG} ${DRONE_BUILD_EVENT}
-  image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder
-  name: copy relase
-  volumes:
-  - name: zerotier-releases
-    path: /zerotier-releases
-  when:
-    event:
-    - tag
-trigger:
-  event:
+  - push
   - tag
   - custom
 type: docker
@@ -224,9 +59,6 @@ clone:
   depth: 1
 depends_on:
 - el9 amd64 build
-- el9 arm64 build
-- el9 ppc64le build
-- el9 s390x build
 kind: pipeline
 name: el9 index
 platform:
@@ -234,7 +66,7 @@ platform:
 pull: always
 steps:
 - commands:
-  - /usr/local/bin/index zerotier-builds redhat el9 amd64 arm64 ppc64le s390x
+  - /usr/local/bin/index zerotier-builds redhat el9 amd64
   environment:
     GPG_PRIVATE_KEY:
       from_secret: gpg-private-key
@@ -247,7 +79,7 @@ steps:
     event:
     - push
 - commands:
-  - /usr/local/bin/index zerotier-releases redhat el9 amd64 arm64 ppc64le s390x
+  - /usr/local/bin/index zerotier-releases redhat el9 amd64
   environment:
     GPG_PRIVATE_KEY:
       from_secret: gpg-private-key
@@ -261,6 +93,113 @@ steps:
     - tag
 trigger:
   event:
+  - push
+  - tag
+  - custom
+type: docker
+volumes:
+- host:
+    path: /zerotier-builds
+  name: zerotier-builds
+- host:
+    path: /zerotier-releases
+  name: zerotier-releases
+---
+clone:
+  depth: 1
+kind: pipeline
+name: jammy amd64 build
+platform:
+  os: linux
+pull: always
+steps:
+- commands:
+  - ./ci/scripts/build.sh jammy ubuntu amd64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT}
+  image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder
+  name: build
+  when:
+    event:
+    - push
+- commands:
+  - ./ci/scripts/build.sh jammy ubuntu amd64 ${DRONE_TAG} ${DRONE_BUILD_EVENT}
+  image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder
+  name: release
+  when:
+    event:
+    - tag
+- commands:
+  - ./ci/scripts/publish.sh jammy ubuntu amd64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT}
+  image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder
+  name: copy build
+  volumes:
+  - name: zerotier-builds
+    path: /zerotier-builds
+  when:
+    event:
+    - push
+- commands:
+  - ./ci/scripts/publish.sh jammy ubuntu amd64 ${DRONE_TAG} ${DRONE_BUILD_EVENT}
+  image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder
+  name: copy relase
+  volumes:
+  - name: zerotier-releases
+    path: /zerotier-releases
+  when:
+    event:
+    - tag
+trigger:
+  event:
+  - push
+  - tag
+  - custom
+type: docker
+volumes:
+- host:
+    path: /zerotier-builds
+  name: zerotier-builds
+- host:
+    path: /zerotier-releases
+  name: zerotier-releases
+---
+clone:
+  depth: 1
+depends_on:
+- jammy amd64 build
+kind: pipeline
+name: jammy index
+platform:
+  os: linux
+pull: always
+steps:
+- commands:
+  - /usr/local/bin/index zerotier-builds ubuntu jammy amd64
+  environment:
+    GPG_PRIVATE_KEY:
+      from_secret: gpg-private-key
+  image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/apt-builder
+  name: index build
+  volumes:
+  - name: zerotier-builds
+    path: /zerotier-builds
+  when:
+    event:
+    - push
+- commands:
+  - /usr/local/bin/index zerotier-releases ubuntu jammy amd64
+  environment:
+    GPG_PRIVATE_KEY:
+      from_secret: gpg-private-key
+  image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/apt-builder
+  name: index release
+  volumes:
+  - name: zerotier-releases
+    path: /zerotier-releases
+  when:
+    event:
+    - tag
+trigger:
+  event:
+  - push
   - tag
   - custom
 type: docker
@@ -304,6 +243,7 @@ steps:
     - tag
 trigger:
   event:
+  - push
   - tag
   - custom
 type: docker
@@ -318,16 +258,15 @@ volumes:
 clone:
   depth: 1
 depends_on:
-- el9 index
+- jammy index
 kind: pipeline
-name: el9 arm64 test
+name: jammy amd64 test
 platform:
-  arch: arm64
   os: linux
 pull: always
 steps:
 - commands:
-  - ./ci/scripts/test.sh el9 redhat arm64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT}
+  - ./ci/scripts/test.sh jammy ubuntu amd64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT}
   image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder
   name: test build
   volumes:
@@ -337,93 +276,7 @@ steps:
     event:
     - push
 - commands:
-  - ./ci/scripts/test.sh el9 redhat arm64 ${DRONE_TAG} ${DRONE_BUILD_EVENT}
-  image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder
-  name: test release
-  volumes:
-  - name: zerotier-releases
-    path: /zerotier-releases
-  when:
-    event:
-    - tag
-trigger:
-  event:
-  - tag
-  - custom
-type: docker
-volumes:
-- host:
-    path: /zerotier-builds
-  name: zerotier-builds
-- host:
-    path: /zerotier-releases
-  name: zerotier-releases
----
-clone:
-  depth: 1
-depends_on:
-- el9 index
-kind: pipeline
-name: el9 ppc64le test
-platform:
-  os: linux
-pull: always
-steps:
-- commands:
-  - ./ci/scripts/test.sh el9 redhat ppc64le 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT}
-  image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder
-  name: test build
-  volumes:
-  - name: zerotier-builds
-    path: /zerotier-builds
-  when:
-    event:
-    - push
-- commands:
-  - ./ci/scripts/test.sh el9 redhat ppc64le ${DRONE_TAG} ${DRONE_BUILD_EVENT}
-  image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder
-  name: test release
-  volumes:
-  - name: zerotier-releases
-    path: /zerotier-releases
-  when:
-    event:
-    - tag
-trigger:
-  event:
-  - tag
-  - custom
-type: docker
-volumes:
-- host:
-    path: /zerotier-builds
-  name: zerotier-builds
-- host:
-    path: /zerotier-releases
-  name: zerotier-releases
----
-clone:
-  depth: 1
-depends_on:
-- el9 index
-kind: pipeline
-name: el9 s390x test
-platform:
-  os: linux
-pull: always
-steps:
-- commands:
-  - ./ci/scripts/test.sh el9 redhat s390x 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT}
-  image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder
-  name: test build
-  volumes:
-  - name: zerotier-builds
-    path: /zerotier-builds
-  when:
-    event:
-    - push
-- commands:
-  - ./ci/scripts/test.sh el9 redhat s390x ${DRONE_TAG} ${DRONE_BUILD_EVENT}
+  - ./ci/scripts/test.sh jammy ubuntu amd64 ${DRONE_TAG} ${DRONE_BUILD_EVENT}
   image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder
   name: test release
   volumes:
@@ -434,6 +287,7 @@ steps:
     - tag
 trigger:
   event:
+  - push
   - tag
   - custom
 type: docker