diff --git a/.github/workflows/linux-port.yml b/.github/workflows/linux-port.yml
index e9a9c62c9..68a0b432c 100644
--- a/.github/workflows/linux-port.yml
+++ b/.github/workflows/linux-port.yml
@@ -35,7 +35,7 @@ jobs:
           clang --version
       - name: Check generation drift
         run: |
-          make ebpf
+          make -B ebpf
           git diff --exit-code -- internal/ebpf/bpf
       - name: Unit tests
         run: go test ./internal/ebpf ./internal/bootstrap ./pkg/event ./pkg/ps ./pkg/api ./pkg/util/signals
diff --git a/Makefile b/Makefile
index 80cf47850..f2a352ba9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,25 +1,33 @@
 .DEFAULT_GOAL := build
 
-SHELL=bash -o pipefail -e
+SHELL := /bin/bash
+.SHELLFLAGS := -euo pipefail -c
 
 BPF2GO_VERSION := v0.20.0
 
 # Specifies a list of build flags
-TAGS ?= ""
+TAGS ?=
 
 BPF_DIR := internal/ebpf
+BPF_OUT := $(BPF_DIR)/bpf
+
+CLANG ?= clang
+GO ?= go
+GOFMT ?= gofmt
+BPF2GO ?= go run github.com/cilium/ebpf/cmd/bpf2go@$(BPF2GO_VERSION)
 
 BPF_FLAGS := \
 	-go-package bpf \
-	-output-dir $(BPF_DIR)/bpf \
-	-cc clang \
+	-output-dir $(BPF_OUT) \
+	-cc $(CLANG) \
 	-target bpfel,bpfeb \
 	-tags linux
 
+# Production headers first; spike/c is only the vmlinux.h fallback.
 BPF_CFLAGS := \
-	-I./$(BPF_DIR)/spike/c \
 	-I./$(BPF_DIR)/c \
 	-I./$(BPF_DIR)/c/common \
+	-I./$(BPF_DIR)/spike/c \
 	-O2 \
 	-g \
 	-D__TARGET_ARCH_x86
@@ -28,30 +36,33 @@ BPF_CFLAGS := \
 BPF_SOURCES := $(wildcard $(BPF_DIR)/c/*.bpf.c)
 BPF_NAMES := $(patsubst $(BPF_DIR)/c/%.bpf.c,%,$(BPF_SOURCES))
 BPF_TARGETS := $(foreach name,$(BPF_NAMES), \
-	$(BPF_DIR)/$(name)_bpfel.go \
-	$(BPF_DIR)/$(name)_bpfeb.go)
+	$(BPF_OUT)/$(name)_bpfel.go \
+	$(BPF_OUT)/$(name)_bpfeb.go)
 
-CLANG ?= clang
-GO ?= go
-GOFMT ?= gofmt
-BPF2GO ?= go run github.com/cilium/ebpf/cmd/bpf2go@$(BPF2GO_VERSION)
+titlecase = $(shell printf '%s' '$(1)' | awk '{print toupper(substr($$0,1,1)) substr($$0,2)}')
 
 .PHONY: ebpf
 ebpf: $(BPF_TARGETS)
-$(BPF_DIR)/%_bpfel.go $(BPF_DIR)/%_bpfeb.go &: $(BPF_DIR)/c/%.bpf.c
-	$(BPF2GO) $(BPF_FLAGS) -output-stem $* $(shell echo $* | sed 's/^./\U&/') $(BPF_DIR)/c/$*.bpf.c -- $(BPF_CFLAGS)
+$(BPF_OUT)/%_bpfel.go $(BPF_OUT)/%_bpfeb.go &: $(BPF_DIR)/c/%.bpf.c
+	$(BPF2GO) $(BPF_FLAGS) -output-stem $* $(call titlecase,$*) $(BPF_DIR)/c/$*.bpf.c -- $(BPF_CFLAGS)
+
+ifeq ($(strip $(TAGS)),)
+BUILD_TAGS :=
+else
+BUILD_TAGS := -tags $(TAGS)
+endif
 
 .PHONY: build
 build:
-	$(GO) build -tags $(TAGS) -o ./cmd/fibratus/fibratus ./cmd/fibratus/
+	$(GO) build $(BUILD_TAGS) -o ./cmd/fibratus/fibratus ./cmd/fibratus/
 
 .PHONY: fmt
 fmt:
-	$(GOFMT) -e -s -l -w pkg cmd
+	$(GOFMT) -e -s -l -w pkg cmd internal
 
 .PHONY: test
 test:
-	$(GO) test ./...
+	$(GO) test ./internal/ebpf ./internal/bootstrap ./pkg/event ./pkg/ps ./pkg/api ./pkg/util/signals ./pkg/filter ./pkg/rules
 
 .PHONY: clean
 clean:
diff --git a/internal/ebpf/bpf/clone_bpfeb.o b/internal/ebpf/bpf/clone_bpfeb.o
index 45c82786e..b8237d893 100644
Binary files a/internal/ebpf/bpf/clone_bpfeb.o and b/internal/ebpf/bpf/clone_bpfeb.o differ
diff --git a/internal/ebpf/bpf/clone_bpfel.o b/internal/ebpf/bpf/clone_bpfel.o
index e81f9adbd..237b36968 100644
Binary files a/internal/ebpf/bpf/clone_bpfel.o and b/internal/ebpf/bpf/clone_bpfel.o differ
diff --git a/internal/ebpf/bpf/ctl_bpfeb.o b/internal/ebpf/bpf/ctl_bpfeb.o
index fc3dd7f59..63c85584a 100644
Binary files a/internal/ebpf/bpf/ctl_bpfeb.o and b/internal/ebpf/bpf/ctl_bpfeb.o differ
diff --git a/internal/ebpf/bpf/ctl_bpfel.o b/internal/ebpf/bpf/ctl_bpfel.o
index 3f289f500..84c760c08 100644
Binary files a/internal/ebpf/bpf/ctl_bpfel.o and b/internal/ebpf/bpf/ctl_bpfel.o differ
diff --git a/internal/ebpf/bpf/execve_bpfeb.o b/internal/ebpf/bpf/execve_bpfeb.o
index 7b84f35fa..3a22c38b0 100644
Binary files a/internal/ebpf/bpf/execve_bpfeb.o and b/internal/ebpf/bpf/execve_bpfeb.o differ
diff --git a/internal/ebpf/bpf/execve_bpfel.o b/internal/ebpf/bpf/execve_bpfel.o
index 265b9cc7e..300111f3a 100644
Binary files a/internal/ebpf/bpf/execve_bpfel.o and b/internal/ebpf/bpf/execve_bpfel.o differ
diff --git a/internal/ebpf/bpf/exit_bpfeb.o b/internal/ebpf/bpf/exit_bpfeb.o
index d19e5fc03..4ddda18cc 100644
Binary files a/internal/ebpf/bpf/exit_bpfeb.o and b/internal/ebpf/bpf/exit_bpfeb.o differ
diff --git a/internal/ebpf/bpf/exit_bpfel.o b/internal/ebpf/bpf/exit_bpfel.o
index 88d910d01..92dbc6818 100644
Binary files a/internal/ebpf/bpf/exit_bpfel.o and b/internal/ebpf/bpf/exit_bpfel.o differ
diff --git a/internal/ebpf/bpf/file_bpfeb.o b/internal/ebpf/bpf/file_bpfeb.o
index 6cba12704..2ff042363 100644
Binary files a/internal/ebpf/bpf/file_bpfeb.o and b/internal/ebpf/bpf/file_bpfeb.o differ
diff --git a/internal/ebpf/bpf/file_bpfel.o b/internal/ebpf/bpf/file_bpfel.o
index 86647ff9b..42919ea6b 100644
Binary files a/internal/ebpf/bpf/file_bpfel.o and b/internal/ebpf/bpf/file_bpfel.o differ
diff --git a/internal/ebpf/bpf/mem_bpfeb.o b/internal/ebpf/bpf/mem_bpfeb.o
index d27b2efd8..789506c53 100644
Binary files a/internal/ebpf/bpf/mem_bpfeb.o and b/internal/ebpf/bpf/mem_bpfeb.o differ
diff --git a/internal/ebpf/bpf/mem_bpfel.o b/internal/ebpf/bpf/mem_bpfel.o
index 4af65725d..5d167155c 100644
Binary files a/internal/ebpf/bpf/mem_bpfel.o and b/internal/ebpf/bpf/mem_bpfel.o differ
diff --git a/internal/ebpf/bpf/net_bpfeb.o b/internal/ebpf/bpf/net_bpfeb.o
index e243bbb79..e33bd9ac6 100644
Binary files a/internal/ebpf/bpf/net_bpfeb.o and b/internal/ebpf/bpf/net_bpfeb.o differ
diff --git a/internal/ebpf/bpf/net_bpfel.o b/internal/ebpf/bpf/net_bpfel.o
index e7502ebb5..6757c2dda 100644
Binary files a/internal/ebpf/bpf/net_bpfel.o and b/internal/ebpf/bpf/net_bpfel.o differ
diff --git a/internal/ebpf/bpf/prociter_bpfeb.o b/internal/ebpf/bpf/prociter_bpfeb.o
index f90905f15..e93d91e49 100644
Binary files a/internal/ebpf/bpf/prociter_bpfeb.o and b/internal/ebpf/bpf/prociter_bpfeb.o differ
diff --git a/internal/ebpf/bpf/prociter_bpfel.o b/internal/ebpf/bpf/prociter_bpfel.o
index 9a541ebfb..c582ec5f2 100644
Binary files a/internal/ebpf/bpf/prociter_bpfel.o and b/internal/ebpf/bpf/prociter_bpfel.o differ