diff --git a/packages/gsa/PKGBUILD b/packages/gsa/PKGBUILD
deleted file mode 100644
index 6ec49134849..00000000000
--- a/packages/gsa/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# This file is part of BlackArch Linux ( https://www.blackarch.org/ ).
-# See COPYING for license details.
-
-pkgname=gsa
-pkgver=22.4
-pkgrel=3
-pkgdesc='Greenbone Security Assistant.'
-arch=('x86_64' 'aarch64')
-url='https://github.com/greenbone/gsa'
-license=('GPL')
-depends=('gvm-libs' 'libgcrypt' 'gnutls' 'postgresql' 'libxml2' 'libmicrohttpd'
-         'openvas-scanner' 'ospd-openvas')
-makedepends=('yarn' 'doxygen' 'xmltoman' 'nodejs' 'npm')
-source=("https://github.com/greenbone/gsa/archive/v$pkgver.tar.gz"
-        "${pkgname}d"
-        "${pkgname}d.service")
-sha512sums=('8e680a7e5b0785a9dd871d56199dae8f4f3b124b6500c08274a2329edf9973ad3841e951dd348aa2c18effbf9d065e9a8ac0f39bde2f6a393e9ca4541ead2f99'
-            '27542d6e194d8fe4ef37364f387293d69f4c7002f2b380b8a21ae995122531ccbce6ca689f0768c463252d33cf0b1735343cbe61eac51947fbec0e05a45e1d1b'
-            '6c65e3ea08b427cd1773c346b054b7b1a3e95d06d6d4070603e97f92b59f9dd465e94992cd6b5927192bc9b859c1268d1cda8d92d4067264389a7a0a578b9d30')
-backup=("etc/default/$pkgname")
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  rm -rf build
-  yarn
-  yarn build
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-
-  install -d "$pkgdir/usr/lib/systemd/system"
-  install -d "$pkgdir/usr/share/gvm/${pkgname}d/web"
-  install -d "$pkgdir/etc/default"
-
-  cp -a build/* "$pkgdir/usr/share/gvm/${pkgname}d/web/"
-
-  install -m 644 "$srcdir/${pkgname}d" "$pkgdir/etc/default"
-  install -m 644 "$srcdir/${pkgname}d.service" "$pkgdir/usr/lib/systemd/system"
-}
-
diff --git a/packages/gsa/gsad b/packages/gsa/gsad
deleted file mode 100644
index 2c0f8740ce4..00000000000
--- a/packages/gsa/gsad
+++ /dev/null
@@ -1,2 +0,0 @@
-# OPTIONS
-OPTIONS="-f --munix-socket=/run/gvm/gvmd.sock --listen=127.0.0.1"
diff --git a/packages/gsa/gsad.service b/packages/gsa/gsad.service
deleted file mode 100644
index 67810ecd6f4..00000000000
--- a/packages/gsa/gsad.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Greenbone Security Assistent
-After=ospd-openvas.service
-Requires=ospd-openvas.service
-
-[Service]
-Type=simple
-User=gvm
-Group=gvm
-EnvironmentFile=-/etc/default/gsad
-ExecStart=/usr/bin/sudo /usr/bin/gsad $OPTIONS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/packages/gvm-libs/PKGBUILD b/packages/gvm-libs/PKGBUILD
deleted file mode 100644
index 6034d8a47b6..00000000000
--- a/packages/gvm-libs/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# This file is part of BlackArch Linux ( https://www.blackarch.org/ ).
-# See COPYING for license details.
-
-pkgname=gvm-libs
-pkgver=22.5.0
-pkgrel=1
-pkgdesc='greenbone-vulnerability-manager libraries.'
-arch=('x86_64' 'aarch64')
-url='https://github.com/greenbone/gvm-libs'
-license=('GPL')
-depends=('gnutls' 'libpcap' 'gpgme' 'libssh' 'glib2' 'libldap' 'hiredis' 'sudo'
-         'libnet' 'paho-mqtt-c' 'zlib' 'libgcrypt' 'util-linux-libs' 'libxml2')
-makedepends=('cmake' 'doxygen' 'graphviz')
-source=("https://github.com/greenbone/gvm-libs/archive/v$pkgver.tar.gz")
-sha512sums=('3e7b9d8a9f846198be629417c11f90b981839aa33958f956144609bdc5a06bd3ec7451f0202c1c3d8447b8107428ede3d79ddcae90ea7af440932cccb301c1f4')
-replaces=('openvas-libraries')
-
-prepare() {
-  cd "$pkgname-$pkgver"
-
-  sed -i '/-Werror/d' CMakeLists.txt
-}
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  #LDFLAGS+=" -Wl,--no-as-needed"
-
-  cmake \
-    -DCMAKE_BUILD_TYPE=None \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIBDIR=/usr/lib \
-    -DSYSCONFDIR=/etc \
-    -DLOCALSTATEDIR=/var \
-    -B build \
-    -S "$pkgname-$pkgver" \
-    .
-
-  make -C build
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" -C build install
-
-  rm -rf "$pkgdir/run"
-}
-
diff --git a/packages/gvmd/PKGBUILD b/packages/gvmd/PKGBUILD
deleted file mode 100644
index 82cb4f350eb..00000000000
--- a/packages/gvmd/PKGBUILD
+++ /dev/null
@@ -1,84 +0,0 @@
-# This file is part of BlackArch Linux ( https://www.blackarch.org/ ).
-# See COPYING for license details.
-
-pkgname=gvmd
-pkgver=22.4
-pkgrel=5
-pkgdesc='OpenVAS / Greenbone vulnerability manager.'
-arch=('x86_64' 'aarch64')
-url='https://github.com/greenbone/gvmd/'
-license=('GPL')
-depends=('gvm-libs' 'libical' 'python3' 'sqlite3' 'postgresql' 'gnutls' 'sudo'
-         'postgresql' 'libxslt' 'libbsd')
-makedepends=('cmake' 'doxygen' 'xmltoman' 'libxslt')
-source=("https://github.com/greenbone/gvmd/archive/v$pkgver.tar.gz"
-        "$pkgname"
-        "$pkgname.install"
-        "$pkgname.service"
-        'greenbone-certdata-sync.timer'
-        'greenbone-feed-sync.timer'
-        'greenbone-scapdata-sync.timer'
-        'greenbone-certdata-sync.service'
-        'greenbone-feed-sync.service'
-        'greenbone-scapdata-sync.service')
-sha512sums=('467652223f0136c9c386622b734f96317ca00cdbec2bb2de4b1c382086e1422b3490c1d883e864d26c183562042ea2b57a3e491cf0df53b60e0b16537b2ac0d2'
-            'fee7f0cbc0795d8269aba7df64adb0dfa8765faacba152f4f4b43cb3140b97c3d18fbcfb0abb0ec7b773fba45d725e00aa9b16ddc272cc4423aa99793c1aa931'
-            'b57434d05d3191e460a15ae0e54c3a56f229ffabc3d1b13f395805eb8259ea225379cedaf1554938dd3e442801cd39149707a49ea589c7ca249ff6ffd2340c43'
-            'b2f914995939c573f057789c76631896c6545913299e4071526d269efa40f935eb6408e74db9b014c9ff2f3d42770c9196e7fcadb0f7eb02fdf0f2530cbb09de'
-            '4d259ff625d29b10040ab1ff7cb472b3dee2355c8ef01275754c5c08779e0de3d5ae1cbb157239fd17d663644b43a642fe15c2d8e13cde037e52ad6a4e2e0afd'
-            'e1be40755530f9793c91c47db3bc1fb65266dcea2d1ba5e3ba1de97a93572bc52a18dc182f9c4d11fc4586f714663447917d70321e32c20bbe35765f999141d2'
-            '224bb41d298083755a77151038403b678bc66b9184b9b960ce4a380f8774ec7794e2f967eb48efd158a9ac7006b4a46a1f84267b50eef3e85ced5193a278a451'
-            '0e61d540bbe7d4a88d080e0b213f6c472d9b1b5bf122780dec9e2644fe15bae9a9938432fdcfde73ed9d280dd319dd4796acb83ea8135aab3fe981a00b612504'
-            'de1cc454f5bdf402368ca06680b542b3c10edd6e0e126be955fd3af140c0bb722b1664a9b3ac72bf10fae54c85142bf58f5becde767a27e102c19abe78216b0a'
-            'd90a42e8f2f77b05432f61ead247e8d4144569ae622159a45f0541469daa4447fa667ef6af42fa0117c957ab2a9afee425fef7bdc3532c8f89021e074c590052')
-replaces=('openvas-manager')
-install="$pkgname.install"
-backup=("etc/default/$pkgname")
-
-prepare() {
-  # Patch for libpq-fe.h search folder
-  sed -ri "s/include <postgresql\/libpq-fe.h>/include <libpq-fe.h>/" \
-    "$pkgname-$pkgver/src/sql_pg.c"
-}
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  cmake \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DSBINDIR=/usr/bin \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DSYSCONFDIR=/etc \
-    -DLOCALSTATEDIR=/var \
-    -DGVM_FEED_LOCK_PATH=/run/gvm/feed-update.lock \
-    -DGVM_RUN_DIR=/run/gvm \
-    .
-
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-
-  install -dm 755 "$pkgdir/etc/default"
-  install -dm 755 "$pkgdir/usr/lib/systemd/system"
-  install -dm 755 "$pkgdir/var/lib/gvm/$pkgname"
-
-  make DESTDIR="$pkgdir" install
-
-  install -d "$pkgdir/usr/lib/systemd/system"
-  install -m 644 "$srcdir/$pkgname-$pkgver/config/$pkgname.service" \
-    "$pkgdir/usr/lib/systemd/system"
-  install -m 644 "$srcdir/$pkgname" "$pkgdir/etc/default"
-  install -m 644 -t "$pkgdir/usr/lib/systemd/system" \
-    "$srcdir/greenbone-certdata-sync.timer" \
-    "$srcdir/greenbone-scapdata-sync.timer" \
-    "$srcdir/greenbone-feed-sync.timer" \
-    "$srcdir/greenbone-certdata-sync.service" \
-    "$srcdir/greenbone-scapdata-sync.service" \
-    "$srcdir/greenbone-feed-sync.service" \
-    "$srcdir/$pkgname.service"
-
-  rm -rf "$pkgdir/lib"
-}
-
diff --git a/packages/gvmd/greenbone-certdata-sync.service b/packages/gvmd/greenbone-certdata-sync.service
deleted file mode 100644
index bbdc467d8d7..00000000000
--- a/packages/gvmd/greenbone-certdata-sync.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Synchronize the greenbon certdata
-Requires=network-online.target
-After=network-online.target
-
-[Service]
-Type=simple
-User=gvm
-Group=gvm
-ExecStart=/usr/bin/greenbone-certdata-sync --rsync
-
-[Install]
-WantedBy=multi-user.target
diff --git a/packages/gvmd/greenbone-certdata-sync.timer b/packages/gvmd/greenbone-certdata-sync.timer
deleted file mode 100644
index a35feb8e651..00000000000
--- a/packages/gvmd/greenbone-certdata-sync.timer
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Synchronize the greenbon certdata daily
-
-[Timer]
-OnCalendar=daily
-
-[Install]
-WantedBy=multi-user.target
diff --git a/packages/gvmd/greenbone-feed-sync.service b/packages/gvmd/greenbone-feed-sync.service
deleted file mode 100644
index 3c9ee7387a3..00000000000
--- a/packages/gvmd/greenbone-feed-sync.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Synchronize the greenbon feed
-Requires=network-online.target
-After=network-online.target
-
-[Service]
-Type=simple
-User=gvm
-Group=gvm
-ExecStart=/usr/bin/greenbone-feed-sync --type GVMD_DATA
-
-[Install]
-WantedBy=multi-user.target
diff --git a/packages/gvmd/greenbone-feed-sync.timer b/packages/gvmd/greenbone-feed-sync.timer
deleted file mode 100644
index b9d9535bc1f..00000000000
--- a/packages/gvmd/greenbone-feed-sync.timer
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Synchronize the greenbon feed daily
-
-[Timer]
-OnCalendar=daily
-
-[Install]
-WantedBy=multi-user.target
diff --git a/packages/gvmd/greenbone-scapdata-sync.service b/packages/gvmd/greenbone-scapdata-sync.service
deleted file mode 100644
index 7649d2fa9de..00000000000
--- a/packages/gvmd/greenbone-scapdata-sync.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Synchronize the greenbon scapdata
-Requires=network-online.target
-After=network-online.target
-
-[Service]
-Type=simple
-User=gvm
-Group=gvm
-ExecStart=/usr/bin/greenbone-scapdata-sync --rsync
-
-[Install]
-WantedBy=multi-user.target
diff --git a/packages/gvmd/greenbone-scapdata-sync.timer b/packages/gvmd/greenbone-scapdata-sync.timer
deleted file mode 100644
index b4dba1836d2..00000000000
--- a/packages/gvmd/greenbone-scapdata-sync.timer
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Synchronize the greenbon scapdata daily
-
-[Timer]
-OnCalendar=daily
-
-[Install]
-WantedBy=multi-user.target
diff --git a/packages/gvmd/gvmd b/packages/gvmd/gvmd
deleted file mode 100644
index dbae088dc66..00000000000
--- a/packages/gvmd/gvmd
+++ /dev/null
@@ -1,2 +0,0 @@
-# OPTIONS
-OPTIONS="-f --osp-vt-update=/run/gvm/ospd.sock"
diff --git a/packages/gvmd/gvmd.install b/packages/gvmd/gvmd.install
deleted file mode 100644
index 9ccbbbde0b2..00000000000
--- a/packages/gvmd/gvmd.install
+++ /dev/null
@@ -1,29 +0,0 @@
-post_install() {
-    chown -R gvm:gvm /etc/gvm
-    chown -R gvm:gvm /var/lib/gvm
-
-    echo
-    echo "##########################################################"
-    echo "#         Before starting to use gvmd run the            #"
-    echo "#         following post installation tasks:             #"
-    echo "##########################################################"
-    echo "# systemctl start greenbone-scapdata-sync                #"
-    echo "# systemctl start greenbone-certdata-sync                #"
-    echo "# systemctl start greenbone-feed-sync                    #"
-    echo "# gvm-manage-certs -a                                    #"
-    echo "##########################################################"
-    echo
-    echo "##########################################################"
-    echo "#         To frequently synchronize the data             #"
-    echo "#         you can enable the daily timers:               #"
-    echo "##########################################################"
-    echo "# systemctl enable --now greenbone-scapdata-sync.timer   #"
-    echo "# systemctl enable --now greenbone-certdata-sync.timer   #"
-    echo "# systemctl enable --now greenbone-feed-sync.timer       #"
-    echo "##########################################################"
-    echo
-}
-
-post_upgrade() {
-    post_install
-}
diff --git a/packages/gvmd/gvmd.service b/packages/gvmd/gvmd.service
deleted file mode 100644
index fa194c70193..00000000000
--- a/packages/gvmd/gvmd.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Greenbone Vulnerability Manager
-After=ospd-openvas.service
-Requires=ospd-openvas.service
-
-[Service]
-Type=simple
-User=gvm
-Group=gvm
-PIDFile=/run/gvm/gvmd.pid
-EnvironmentFile=-/etc/default/gvmd
-ExecStart=/usr/bin/gvmd $OPTIONS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/packages/openvas-scanner/PKGBUILD b/packages/openvas-scanner/PKGBUILD
deleted file mode 100644
index bf915722aef..00000000000
--- a/packages/openvas-scanner/PKGBUILD
+++ /dev/null
@@ -1,65 +0,0 @@
-# This file is part of BlackArch Linux ( https://www.blackarch.org/ ).
-# See COPYING for license details.
-
-pkgname=openvas-scanner
-pkgver=22.5.0
-pkgrel=1
-pkgdesc='The OpenVAS scanning Daemon.'
-groups=('blackarch' 'blackarch-scanner' 'blackarch-recon' 'blackarch-fuzzer'
-        'blackarch-exploitation')
-arch=('x86_64' 'aarch64')
-url='https://github.com/greenbone/openvas-scanner/'
-license=('GPL')
-depends=('gvm-libs' 'redis' 'rsync' 'json-glib' 'gvmd')
-conflicts=('openvas')
-makedepends=('cmake' 'doxygen')
-install="$pkgname.install"
-source=("https://github.com/greenbone/$pkgname/archive/v$pkgver.tar.gz"
-        "greenbone-nvt-sync.service"
-        "greenbone-nvt-sync.timer"
-        "$pkgname.install"
-      )
-sha512sums=('9af44effc313d8c5898a05803ceef2559e39029f4e7573c18758fbfade4c6439d9957361481878e0cd1cd8237076b619ca5d233f747b2829f0cfbe08faf94ac5'
-            '1ef913c24721533b0f779047532de63d195e8498885b90972a7bbbfb734444c0f7cbdcc52c437b2ce773881d45eadfcec03fcd00886e02962cb06d318d0c7c96'
-            '2df63297cd9bd1cfb7b774152b1791ff946a1a410e563e54212652d847063b3c22b5362cd287b1bd73684be1fbd66464a2f8bb79b92cd086ba58e9a801d675ec'
-            'a7a743ab2899187cf4dd71c605ed3acb722f19d5e3077858f3a6b3199b384de3d59c05c2c5d6cf0ce2df7ab1de99f058de6ff8c931b6fd33a8fbccf8d3afd82c')
-
-prepare() {
-  cd "$pkgname-$pkgver"
-
-  sed -i '/-Werror/d' CMakeLists.txt
-}
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  cmake \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DSBINDIR=/usr/bin \
-    -DLIBDIR=/usr/lib \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DSYSCONFDIR=/etc \
-    -DLOCALSTATEDIR=/var \
-    -DOPENVAS_FEED_LOCK_PATH=/run/gvm/feed-update.lock \
-    -DOPENVAS_NVT_DIR=/var/lib/openvas \
-    --debug-output \
-    .
-
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  cp "$srcdir/$pkgname-$pkgver/config/redis-openvas.conf" "$pkgdir/etc/openvas"
-
-  install -m 755 -d "$pkgdir/usr/lib/systemd/system"
-
-  install -m 644 "$srcdir/greenbone-nvt-sync.service" \
-    "$pkgdir/usr/lib/systemd/system"
-  install -m 644 "$srcdir/greenbone-nvt-sync.timer" \
-    "$pkgdir/usr/lib/systemd/system"
-}
-
diff --git a/packages/openvas-scanner/greenbone-nvt-sync.service b/packages/openvas-scanner/greenbone-nvt-sync.service
deleted file mode 100644
index 823a5b27a68..00000000000
--- a/packages/openvas-scanner/greenbone-nvt-sync.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Synchronize the greenbon nvt entries
-Requires=network-online.target
-After=network-online.target
-After=redis.service
-
-[Service]
-Type=simple
-User=gvm
-Group=gvm
-ExecStart=/usr/bin/sh -c '/usr/bin/greenbone-nvt-sync && sudo openvas --update-vt-info'
-
-[Install]
-WantedBy=multi-user.target
diff --git a/packages/openvas-scanner/greenbone-nvt-sync.timer b/packages/openvas-scanner/greenbone-nvt-sync.timer
deleted file mode 100644
index bd73fbcfd01..00000000000
--- a/packages/openvas-scanner/greenbone-nvt-sync.timer
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Synchronize the greenbon nvts daily
-
-[Timer]
-OnCalendar=daily
-
-[Install]
-WantedBy=multi-user.target
diff --git a/packages/openvas-scanner/openvas-scanner.install b/packages/openvas-scanner/openvas-scanner.install
deleted file mode 100644
index a3a6ea65833..00000000000
--- a/packages/openvas-scanner/openvas-scanner.install
+++ /dev/null
@@ -1,32 +0,0 @@
-post_install() {
-    usermod -aG redis gvm
-    mkdir -p /run/gvm
-    chown -R gvm:gvm /run/gvm
-    chown -R gvm:gvm /etc/openvas
-    echo "net.core.somaxconn = 1024" > /etc/sysctl.d/90-openvas.conf
-    echo "vm.overcommit_memory = 1" >> /etc/sysctl.d/90-openvas.conf
-    sysctl -p /etc/sysctl.d/90-openvas.conf
-    mv /etc/openvas/redis-openvas.conf /etc/redis/redis-openvas.conf
-    chown redis:redis /etc/redis/redis-openvas.conf
-    echo "db_address = /run/redis/redis.sock" > /etc/openvas/openvas.conf
-    chown gvm:gvm /etc/openvas/openvas.conf
-
-    echo
-    echo "##########################################################"
-    echo "#         Before starting to use openvas you need        #"
-    echo "#         first to sync the NVT DB:                      #"
-    echo "# systemctl start greenbone-nvt-sync                     #"
-    echo "##########################################################"
-    echo
-    echo "##########################################################"
-    echo "#         To frequently synchronize the data             #"
-    echo "#         you can enable the daily timer:                #"
-    echo "##########################################################"
-    echo "# systemctl enable --now greenbone-nvt-sync.timer        #"
-    echo "##########################################################"
-    echo
- }
-
-post_upgrade() {
-    post_install
-}
\ No newline at end of file
diff --git a/packages/openvas-scanner/openvas.install b/packages/openvas-scanner/openvas.install
deleted file mode 100644
index a8f522919ef..00000000000
--- a/packages/openvas-scanner/openvas.install
+++ /dev/null
@@ -1,27 +0,0 @@
-post_install() {
-    chown -R gvm:gvm /etc/openvas
-
-    echo
-    echo "##########################################################"
-    echo "#         Before starting to use openvas run the         #"
-    echo "#         following post installation tasks:             #"
-    echo "##########################################################"
-    echo '# echo "net.core.somaxconn = 1024" >> /etc/sysctl.conf   #'
-    echo '# echo "vm.overcommit_memory = 1" >> /etc/sysctl.conf    #'
-    echo "# sysctl -p                                              #"
-    echo "#                                                        #"
-    echo "# systemctl start greenbone-nvt-sync                     #"
-    echo "##########################################################"
-    echo
-    echo "##########################################################"
-    echo "#         To frequently synchronize the data             #"
-    echo "#         you can enable the daily timers:               #"
-    echo "##########################################################"
-    echo "# systemctl enable --now greenbone-nvt-sync.timer        #"
-    echo "##########################################################"
-    echo
- }
-
-post_upgrade() {
-    post_install
-}
diff --git a/packages/ospd-openvas/PKGBUILD b/packages/ospd-openvas/PKGBUILD
deleted file mode 100644
index 31021f4db09..00000000000
--- a/packages/ospd-openvas/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# This file is part of BlackArch Linux ( https://www.blackarch.org/ ).
-# See COPYING for license details.
-
-pkgname=ospd-openvas
-pkgver=22.4.0
-pkgrel=4
-pkgdesc='OSP Server for openvas.'
-arch=('x86_64' 'aarch64')
-url='https://github.com/greenbone/ospd-openvas'
-license=('GPL')
-depends=('python-redis' 'python-psutil' 'python-packaging' 'openvas-scanner'
-         'python-paho-mqtt' 'python-gnupg')
-provides=('python-ospd-openvas')
-conflicts=('python-ospd-openvas')
-makedepends=('python-setuptools' 'python-poetry' 'python-installer')
-source=("https://github.com/greenbone/ospd-openvas/archive/v$pkgver.tar.gz"
-        "$pkgname"
-        "$pkgname.service")
-sha512sums=('9ceaca7843c406361aeaa6c15386c150c449c08586382f95074cf346a4ebf7dd57ee97cda2784758845d03852488989ad18963eba0f01c4bb190fafa3480df9b'
-            '3461820543ac6bc0cd50026023a6271e015123366fc44ce66ead1221d52c9e534063881f3b46a50a6e43ec9caff697376c35f1ce2cd22944e7b58f02070a78a8'
-            'ddaa5ad183265df4a89661acde7f0c8a5d1fd4c0748e3ca2dd267d3e7e05e6975a62023833bdd048ab97076c9ec839e7ad2fd463ef16b246e5813e328956b50e')
-backup=("etc/default/$pkgname")
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  poetry build
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-
-  install -d "$pkgdir/etc/default"
-  install -d "$pkgdir/usr/lib/systemd/system"
-
-  PYTHONPYCACHEPREFIX="${PWD}/.cache/cpython/" python -m installer \
-    -d "$pkgdir" dist/*.whl
-
-  install -m 644 "$srcdir/$pkgname" "$pkgdir/etc/default"
-  install -m 644 "$srcdir/$pkgname.service" "$pkgdir/usr/lib/systemd/system"
-}
-
diff --git a/packages/ospd-openvas/ospd-openvas b/packages/ospd-openvas/ospd-openvas
deleted file mode 100644
index 58f3d5190b9..00000000000
--- a/packages/ospd-openvas/ospd-openvas
+++ /dev/null
@@ -1,2 +0,0 @@
-# OPTIONS
-OPTIONS="-f"
diff --git a/packages/ospd-openvas/ospd-openvas.service b/packages/ospd-openvas/ospd-openvas.service
deleted file mode 100644
index b392eef658f..00000000000
--- a/packages/ospd-openvas/ospd-openvas.service
+++ /dev/null
@@ -1,18 +0,0 @@
-[Unit]
-Description=Openvas OSP Server
-After=redis.service
-
-[Service]
-Type=simple
-User=gvm
-Group=gvm
-EnvironmentFile=-/etc/default/ospd-openvas
-ExecStartPre=-/usr/bin/sh -c 'rm -rf /run/gvm/ospd-openvas.pid /run/gvm/ospd.sock /run/gvm/gvmd.sock'
-ExecStart=/usr/bin/ospd-openvas \
---pid-file=/run/gvm/ospd-openvas.pid \
---lock-file-dir=/run/gvm \
---unix-socket=/run/gvm/ospd.sock \
-$OPTIONS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/packages/ospd/PKGBUILD b/packages/ospd/PKGBUILD
deleted file mode 100644
index 237448dd938..00000000000
--- a/packages/ospd/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# This file is part of BlackArch Linux ( https://www.blackarch.org/ ).
-# See COPYING for license details.
-
-pkgname=ospd
-pkgver=21.4.4
-pkgrel=3
-pkgdesc='Greenbone Open Scanner Protocol python bindings.'
-arch=('x86_64' 'aarch64')
-url='https://github.com/greenbone/ospd'
-license=('GPL')
-depends=('python-paramiko' 'python-lxml' 'python-defusedxml' 'python-pytest'
-         'python-deprecated' 'python-psutil')
-provides=('python-ospd')
-conflicts=('python-ospd')
-makedepends=('python-setuptools')
-source=("https://github.com/greenbone/$pkgname/archive/v$pkgver.tar.gz")
-sha512sums=('700cae3a248e8998a00116c7f49a2dccd7cc23d8317eed9200472c5574962b2b4767c3d689ccca93e919b10e1ecb8160bdb1e2d155fdd2e76d12a23d07748ca4')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  python setup.py build
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-
-  python setup.py install --root="$pkgdir" --prefix=/usr -O1 --skip-build
-}
-
diff --git a/packages/python2-yara/PKGBUILD b/packages/python2-yara/PKGBUILD
index 92a563db736..c5e561aa2b5 100644
--- a/packages/python2-yara/PKGBUILD
+++ b/packages/python2-yara/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=python2-yara
 _pkgname=yara-python
 pkgver=4.0.5
-pkgrel=3
+pkgrel=4
 pkgdesc='Python interface for YARA.'
 url='https://pypi.org/project/yara-python/#files'
 arch=('x86_64' 'aarch64')