diff --git a/.drone.yml b/.drone.yml
index 0300b972..879dfc3d 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -8,28 +8,29 @@ platform:
   arch: amd64
 
 trigger:
-  branch: [development]
-  event: [push]
+  event: [push, pull_request]
 
 steps:
+- name: pull-archlinux-cdev:latest
+  pull: always
+  image: immawanderer/archlinux-cdev:latest
+  depends_on: [clone]
+  commands:
+  - uname -r
+  - cat /etc/os-release
+
 - name: pull-fedora:34
   pull: always
   image: fedora:34
   depends_on: [clone]
   commands:
   - uname -r
-
-- name: pull-alpine
-  pull: always
-  image: alpine
-  depends_on: [clone]
-  commands:
-  - uname -r
+  - cat /etc/os-release
 
 ---
 kind: pipeline
 type: docker
-name: build-single-step
+name: testing-ng
 
 platform:
   os: linux
@@ -39,65 +40,56 @@ depends_on:
 - pull
 
 trigger:
-  branch: [development]
-  event: [push]
+  event: [push, pull_request]
 
 steps:
-- name: build
-  pull: always
-  image: fedora:34
+- name: deps
+  pull: if-not-exists
+  image: immawanderer/archlinux-cdev:latest
+  volumes:
+  - name: usrcache
+    path: /usr
   commands:
-  - dnf install -y perl wget
-  - perl src/fastnetmon_build.pl --install_dependency_packages_only
-  - perl src/fastnetmon_build.pl --build_gcc_only
-  - perl src/fastnetmon_build.pl --build_dependencies_only
-  - perl src/fastnetmon_build.pl --use-git-master --build_fastnetmon_only
-  - perl src/scripts/build_libary_bundle.pl /opt/fastnetmon_libraries_bundle.tar.gz
+  - printf "$SHELL\n"
+  - printf "$PATH\n"
+  - pacman -Sy grpc protobuf-c python-protobuf grpc-cli cppunit log4cpp json-c capnproto hiredis mongo-c-driver boost boost-libs libtool which autoconf automake pkgconf gcc-libs git --needed
 
----
-kind: pipeline
-type: docker
-name: build-multi-step
-
-platform:
-  os: linux
-  arch: amd64
-
-depends_on:
-- pull
-
-trigger:
-  branch: [development]
-  event: [push]
-
-steps:
-- name: install_required_packaged
-  pull: always
-  image: fedora:34
+- name: apply-patch
+  pull: if-not-exists
+  image: immawanderer/archlinux-cdev:latest
+  volumes:
+  - name: usrcache
+    path: /usr
   commands:
-  - dnf install -y perl wget
-  - perl src/fastnetmon_build.pl --install_dependency_packages_only
+  - git apply src/patches/cmake-libndpi-nolibicu-cpp17-includes-protoc-grpc.patch
 
-- name: install_gcc
-  pull: always
-  image: fedora:34
+- name: build-install-nDPI
+  pull: if-not-exists
+  image: immawanderer/archlinux-cdev:latest
+  volumes:
+  - name: usrcache
+    path: /usr
   commands:
-  - dnf install -y perl wget
-  - perl src/fastnetmon_build.pl --build_gcc_only
+  - export MAKEFLAGS="$MAKEFLAGS -j$(nproc)" && printf "$MAKEFLAGS\n"
+  - git clone https://github.com/ntop/nDPI.git ../nDPI && cd ../nDPI && pwd
+  - git checkout 1.7
+  - ./autogen.sh
+  - ./configure
+  - make
+  - make install
 
-- name: install_dependencies
-  pull: always
-  image: fedora:34
+- name: build-fastnetmon
+  pull: if-not-exists
+  image: immawanderer/archlinux-cdev:latest
+  volumes:
+  - name: usrcache
+    path: /usr
   commands:
-  - dnf install -y perl wget
-  - perl src/fastnetmon_build.pl --build_dependencies_only
-  - perl src/fastnetmon_build.pl --use-git-master --build_fastnetmon_only
-  - perl src/scripts/build_libary_bundle.pl /opt/fastnetmon_libraries_bundle.tar.gz
+  - export MAKEFLAGS="$MAKEFLAGS -j$(nproc)"
+  - cd src
+  - cmake -DCMAKE_CXX_FLAGS="$CMAKE_CXX_FLAGS -Wall -Werror -Wextra -Wno-reorder -Wno-unused-variable -Wno-unused-parameter -Wno-sign-compare -Wno-unused-but-set-variable -Wno-format-truncation -Wno-implicit-fallthrough -Wno-type-limits -Wno-class-memaccess -Wno-stringop-truncation"
+  - make clean fastnetmon all
 
-- name: collect_debug
-  pull: always
-  image: alpine
-  commands:
-  - cat /tmp/fastnetmon_install.log
-  when:
-    status: [failure]
+volumes:
+- name: usrcache
+  temp: {}