diff --git a/.gitmodules b/.gitmodules
index 6507b89..12a8cd8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -55,12 +55,6 @@
 [submodule "doomretro"]
 	path = doomretro
 	url = ssh://aur@aur.archlinux.org/doomretro.git
-[submodule "drone-runner-exec"]
-	path = drone-runner-exec
-	url = ssh://aur@aur.archlinux.org/drone-runner-exec.git
-[submodule "drone-runner-ssh"]
-	path = drone-runner-ssh
-	url = ssh://aur@aur.archlinux.org/drone-runner-ssh.git
 [submodule "duckdb"]
 	path = duckdb
 	url = ssh://aur@aur.archlinux.org/duckdb.git
diff --git a/drone-cli/PKGBUILD b/drone-cli/PKGBUILD
deleted file mode 100644
index 5a46e33..0000000
--- a/drone-cli/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# Maintainer: George Rawlinson <grawlinson@archlinux.org>
-
-pkgname=drone-cli
-pkgver=1.4.0
-pkgrel=1
-pkgdesc="Command line interface for Drone CI"
-arch=('x86_64')
-url="https://docs.drone.io/cli"
-license=('Apache')
-makedepends=('go' 'git')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/drone/drone-cli/archive/v$pkgver.tar.gz")
-b2sums=('a894c14c011374df5498bace23d40e7376b112250cbf901419f26eb6434fae12a6c325fde907adc25049c3c712574fa41a34984fd8467417134b755a06bde64e')
-
-prepare() {
-  cd "$pkgname-$pkgver"
-
-  # create directory for build output
-  mkdir build
-
-  # download dependencies
-  go mod vendor
-}
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  # set Go flags
-  export CGO_CPPFLAGS="${CPPFLAGS}"
-  export CGO_CFLAGS="${CFLAGS}"
-  export CGO_CXXFLAGS="${CXXFLAGS}"
-
-  go build -v \
-    -trimpath \
-    -buildmode=pie \
-    -mod=vendor \
-    -modcacherw \
-    -ldflags "-linkmode external -extldflags ${LDFLAGS} -X main.version=$pkgver" \
-    -o build \
-    ./...
-}
-
-check() {
-  cd "$pkgname-$pkgver"
-  go test -v ./...
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-
-  # binary
-  install -vDm755 -t "$pkgdir/usr/bin" build/drone
-
-  # documentation
-  install -vDm644 -t "$pkgdir/usr/share/doc/$pkgname" *.md
-}
diff --git a/drone-runner-docker/PKGBUILD b/drone-runner-docker/PKGBUILD
deleted file mode 100644
index be46b1b..0000000
--- a/drone-runner-docker/PKGBUILD
+++ /dev/null
@@ -1,77 +0,0 @@
-# Maintainer: George Rawlinson <grawlinson@archlinux.org>
-
-pkgname=drone-runner-docker
-pkgver=1.7.0
-pkgrel=1
-pkgdesc="Drone pipeline runner that executes builds inside Docker containers"
-arch=('x86_64')
-url="https://github.com/drone-runners/drone-runner-docker"
-license=('custom:Polyform-Small-Business-1.0.0' 'custom:Polyform-Free-Trial-1.0.0')
-depends=('docker')
-makedepends=('go' 'git')
-optdepends=('drone: for a local Drone instance')
-source=(
-  "$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
-  'systemd.service'
-  'sysusers.conf'
-  'tmpfiles.conf'
-)
-sha512sums=('1bc1a88b6e645e7bd9285101387fa9490a5d8f6f6493efb5987349e8b00b9571bf52079ada3d3f314fa0e8fd63abcd89f5b5c2e6b030231968c340498ae9025b'
-            'eb92c3ad379153953adb07d064d1f33ba52015df2fb045412c57d38c5000f74ce1a0f8ea6042ffd1a5dcf3adbc5535b19067488cc5fd351d78c014effbbd17e8'
-            'fd328a189b7144e1cc519cf24863de2c4552c4df29ebb30cad3d100163577bd3083cdadb8eef7fa6970149f5a470490fd26a47ddf2a8d502cd38e977599159a1'
-            'e0d22286f58388e0393c0368bd5ea56099718ba772805913056c5251597d3887e013ba5fc9243d856d61d3b531dfd18087dd7aafe43c5857074ad6caceeee255')
-b2sums=('e7b749cf2c04f11ed9cb5e486a1bb7a39c85f060ee9448ee9206407788a058d8d829d1c54571699206de6a01a5546256d127f604e3a7948df31606dd43e31350'
-        'a76e0c190fcecbd99be68e9ead11c6cda27cf30045c9585356032982d1ecf053f2e8ed5b2a640403bd6a214eccfa50ec425bf34a284966a315a6754272133e99'
-        '327ef1f6158fc970d37b41d40e3b2f2c937f701ac4d7dda846b48ddf517d3f0e39ce360ae13aef8539587e71f861593941da3be32df032f6d65deb7927c8da9b'
-        '02b6ca4f1bdbaf968c81a2aab25efdb76d53590baadfa4c239239bc2b39bf09f8266775fc8addcf3a51fa48bd0a1ecfdb34c674b7355fbe5476cd53ae1780504')
-
-prepare() {
-  cd "$pkgname-$pkgver"
-
-  # create directory for build output
-  mkdir -p build
-
-  # download dependencies
-  go mod download
-}
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  # set Go flags
-  export CGO_CPPFLAGS="${CPPFLAGS}"
-  export CGO_CFLAGS="${CFLAGS}"
-  export CGO_CXXFLAGS="${CXXFLAGS}"
-
-  go build -v \
-    -trimpath \
-    -buildmode=pie \
-    -mod=readonly \
-    -modcacherw \
-    -ldflags "-linkmode external -extldflags \"${LDFLAGS}\"" \
-    -o build \
-    .
-}
-
-check() {
-  cd "$pkgname-$pkgver"
-  go test -v ./...
-}
-
-package() {
-  # systemd integration
-  install -vDm644 systemd.service "$pkgdir/usr/lib/systemd/system/$pkgname.service"
-  install -vDm644 sysusers.conf "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
-  install -vDm644 tmpfiles.conf "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
-
-  cd "$pkgname-$pkgver"
-
-  # binary
-  install -vDm755 -t "$pkgdir/usr/bin" build/*
-
-  # licenses
-  install -vDm644 -t "$pkgdir/usr/share/licenses/$pkgname" licenses/* LICENSE.md
-
-  # documentation
-  install -vDm644 -t "$pkgdir/usr/share/doc/$pkgname" README.md CHANGELOG.md
-}
diff --git a/drone-runner-docker/systemd.service b/drone-runner-docker/systemd.service
deleted file mode 100644
index f56049c..0000000
--- a/drone-runner-docker/systemd.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Drone Runner (Docker)
-Requires=network-online.target
-After=network-online.target
-
-[Service]
-User=drone-runner-docker
-Group=drone-runner-docker
-WorkingDirectory=/var/lib/drone-runner-docker
-ReadWritePaths=/var/lib/drone-runner-docker
-ExecStart=/usr/bin/drone-runner-docker
-
-[Install]
-WantedBy=multi-user.target
diff --git a/drone-runner-docker/sysusers.conf b/drone-runner-docker/sysusers.conf
deleted file mode 100644
index e879bd1..0000000
--- a/drone-runner-docker/sysusers.conf
+++ /dev/null
@@ -1 +0,0 @@
-u drone-runner-docker - "Drone Runner Docker user"
diff --git a/drone-runner-docker/tmpfiles.conf b/drone-runner-docker/tmpfiles.conf
deleted file mode 100644
index 7df72ed..0000000
--- a/drone-runner-docker/tmpfiles.conf
+++ /dev/null
@@ -1 +0,0 @@
-d /var/lib/drone-runner-docker 0750 drone-runner-docker drone-runner-docker
diff --git a/drone-runner-exec b/drone-runner-exec
deleted file mode 160000
index d587802..0000000
--- a/drone-runner-exec
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d5878027c36aa0c61dfb283da1f8b5cd9c5f5c70
diff --git a/drone-runner-ssh b/drone-runner-ssh
deleted file mode 160000
index e4e091d..0000000
--- a/drone-runner-ssh
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e4e091d46c9fdd601919dcacc5cff39e5e1c38f3
diff --git a/drone/.SRCINFO b/drone/.SRCINFO
deleted file mode 100644
index 6660383..0000000
--- a/drone/.SRCINFO
+++ /dev/null
@@ -1,14 +0,0 @@
-pkgbase = drone
-	pkgdesc = Drone is a Continuous Delivery platform built on Docker, written in Go - OSS variant
-	pkgver = 2.0.3
-	pkgrel = 1
-	url = https://drone.io
-	arch = x86_64
-	license = Apache
-	makedepends = go
-	makedepends = git
-	source = drone-2.0.3.tar.gz::https://github.com/drone/drone/archive/v2.0.3.tar.gz
-	sha256sums = 354b60a8616dfa17ebe3f82026f0865619e55f0725a60d850ce81c50733debcb
-
-pkgname = drone
-
diff --git a/drone/PKGBUILD b/drone/PKGBUILD
deleted file mode 100644
index 7127694..0000000
--- a/drone/PKGBUILD
+++ /dev/null
@@ -1,111 +0,0 @@
-# Maintainer: George Rawlinson <grawlinson@archlinux.org>
-# Contributor: Khorne <khorne AT khorne DOT me>
-
-pkgbase=drone
-pkgname=(
-  'drone'
-  'drone-oss'
-)
-pkgver=2.4.0
-pkgrel=2
-pkgdesc="Continuous Delivery platform built on container technology"
-arch=('x86_64')
-url="https://drone.io"
-makedepends=('go' 'git')
-source=(
-  "$pkgbase-$pkgver.tar.gz::https://github.com/drone/drone/archive/v$pkgver.tar.gz"
-  'systemd.service'
-  'tmpfiles.conf'
-  'sysusers.conf'
-)
-sha512sums=('91d5bace2bea4aeaa97b49f16153261d6dbd986bff7239367a84a68a7327d4a0d0d0015cf78b2b1e42ccc8fb69516b924c4aff8b0e11d1dac96443cdbe90ae7f'
-            '51f274d1edf1f8ee127cb84ca420c32de1e5c0a8a2363b4221034be430a1c93a7517deb997fddade4988b90735b2fbe50ce450058510e1dd64944ee18a96af49'
-            'dfdc522b0e17f6b68d86f6599020bc75328de84aa1a393c53a0edc5ed229fb6ef99a0b544eebca6f9eee1b9f2ce04906bcca105792bccf2e49cdd51f10026886'
-            '9488ba861487ecaf96e6b39afc3aeabd0951b9c0ee552cdb552d12f08f73cdcf2c57e5a322139f34e0aa5b2c9b2f5751f08bf66dca2bd8dd041b60b96e41c710')
-b2sums=('7095ecbb3ece029b1b63ae1297f2a257fe9cc5e48de1eb596a6f25efc4e77e371b712f7647fe5ef44d96183cb0ca4e2fe83064995fd942eefe8c2897f938652a'
-        'e7bec2be6fc60c36e8c880dcedffde8ec7d0c1b5cbe0fef07526221b48820314f69a8282f341478a89711216b91b58114c0e7e1270d941bc7bd175f952837452'
-        '9c1bf8e4a382190f2d1bd560ef5c4a9fadad8c38dcd3cf3b79af42f6d0c16de533ba2d5f6cf676003e4ca6b745833e5e100baf4328111cf540ac5f43f67c6145'
-        '18e5c4ea19348479dc3408bd2546f324f0908acc759c7c79c350006c6c5e6db02cd388a9aa9bd3d4f6b4b1f2efcf6aa7f7e67eac43f8d55566afe341b7ec142e')
-
-prepare() {
-  cd "$pkgbase-$pkgver"
-
-  # create directory for build output
-  mkdir build build-oss
-
-  # download dependencies
-  go mod vendor
-}
-
-build() {
-  cd "$pkgbase-$pkgver"
-
-  # set Go flags
-  export CGO_CPPFLAGS="${CPPFLAGS}"
-  export CGO_CFLAGS="${CFLAGS}"
-  export CGO_CXXFLAGS="${CXXFLAGS}"
-
-  # enterprise version
-  go build -v \
-    -trimpath \
-    -buildmode=pie \
-    -mod=vendor \
-    -modcacherw \
-    -ldflags "-linkmode external -extldflags \"${LDFLAGS}\"" \
-    -o build \
-    ./cmd/...
-
-  # community version
-  go build -v \
-    -trimpath \
-    -buildmode=pie \
-    -mod=vendor \
-    -modcacherw \
-    -ldflags "-linkmode external -extldflags \"${LDFLAGS}\"" \
-    -tags "oss nolimit" \
-    -o build-oss \
-    ./cmd/...
-}
-
-check() {
-  cd "$pkgbase-$pkgver"
-  go test -v ./...
-}
-
-package_drone() {
-  pkgdesc+=" (Enterprise Edition)"
-  license=('custom:Drone-Non-Commercial')
-  # ref: https://discourse.drone.io/t/exec-runner-404-error-on-ping/7922
-  depends=('glibc' 'docker')
-  conflicts=('drone-oss')
-
-  # systemd integration
-  install -vDm644 systemd.service "$pkgdir/usr/lib/systemd/system/$pkgname.service"
-  install -vDm644 sysusers.conf "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
-  install -vDm644 tmpfiles.conf "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
-
-  cd "$pkgbase-$pkgver"
-
-  # binary
-  install -vDm755 -t "$pkgdir/usr/bin" build/*
-
-  # license
-  install -vDm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE NOTICE
-}
-
-package_drone-oss() {
-  pkgdesc+=" (Community Edition)"
-  license=('Apache')
-  depends=('glibc')
-  conflicts=('drone')
-
-  # systemd integration
-  install -vDm644 systemd.service "$pkgdir/usr/lib/systemd/system/$pkgname.service"
-  install -vDm644 sysusers.conf "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
-  install -vDm644 tmpfiles.conf "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
-
-  cd "$pkgbase-$pkgver"
-
-  # binary
-  install -vDm755 -t "$pkgdir/usr/bin" build-oss/*
-}
diff --git a/drone/systemd.service b/drone/systemd.service
deleted file mode 100644
index 12a174f..0000000
--- a/drone/systemd.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Drone
-Requires=network-online.target
-After=network-online.target
-
-[Service]
-User=drone
-Group=drone
-ExecStart=/usr/bin/drone-server
-RestartSec=5
-Restart=on-failure
-SyslogIdentifier=drone-server
-
-[Install]
-WantedBy=multi-user.target
diff --git a/drone/sysusers.conf b/drone/sysusers.conf
deleted file mode 100644
index b808abd..0000000
--- a/drone/sysusers.conf
+++ /dev/null
@@ -1 +0,0 @@
-u drone - "Drone system user" /var/lib/drone
diff --git a/drone/tmpfiles.conf b/drone/tmpfiles.conf
deleted file mode 100644
index 6c6a9a9..0000000
--- a/drone/tmpfiles.conf
+++ /dev/null
@@ -1 +0,0 @@
-d /var/lib/drone 0755 drone drone