diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a55c3498a0..da037552a6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -109,7 +109,7 @@ jobs:
       - name: Build and test 🏗️🧪
         run: |
           mkdir -p build
-          cd build && cmake -DBUILD_BPF=On -DBUILD_DRIVER=Off -DUSE_BUNDLED_DEPS=On -DUSE_BUNDLED_LIBELF=Off -DBUILD_LIBSCAP_MODERN_BPF=ON -DMUSL_OPTIMIZED_BUILD=On ../
+          cd build && cmake -DBUILD_BPF=On -DBUILD_DRIVER=Off -DUSE_BUNDLED_DEPS=On -DUSE_BUNDLED_LIBELF=Off -DUSE_SHARED_LIBELF=Off -DBUILD_LIBSCAP_MODERN_BPF=ON -DMUSL_OPTIMIZED_BUILD=On ../
           make run-unit-tests -j4
 
   build-shared-libs-linux-amd64:
diff --git a/cmake/modules/libelf.cmake b/cmake/modules/libelf.cmake
index 8d69ac1730..f92d038193 100644
--- a/cmake/modules/libelf.cmake
+++ b/cmake/modules/libelf.cmake
@@ -13,12 +13,13 @@
 #
 
 option(USE_BUNDLED_LIBELF "Enable building of the bundled libelf" ${USE_BUNDLED_DEPS})
+option(USE_SHARED_LIBELF "When not using bundled libelf, link it dynamically" ON)
 
 if(LIBELF_INCLUDE)
     # we already have LIBELF
 elseif(NOT USE_BUNDLED_LIBELF)
     find_path(LIBELF_INCLUDE elf.h PATH_SUFFIXES elf)
-    if(BUILD_SHARED_LIBS)
+    if(BUILD_SHARED_LIBS OR USE_SHARED_LIBELF)
         set(LIBELF_LIB_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX})
     else()
         set(LIBELF_LIB_SUFFIX ${CMAKE_STATIC_LIBRARY_SUFFIX})
diff --git a/test/e2e/tests/commons/sinspqa/event_generator.py b/test/e2e/tests/commons/sinspqa/event_generator.py
index 95ec5b3353..4244b8b881 100644
--- a/test/e2e/tests/commons/sinspqa/event_generator.py
+++ b/test/e2e/tests/commons/sinspqa/event_generator.py
@@ -1,6 +1,6 @@
 def container_spec(syscall: str) -> dict:
     return {
-        'image': 'falcosecurity/event-generator',
+        'image': 'falcosecurity/event-generator:0.10.2',
         'args': ['run', syscall],
         'privileged': True,
     }