diff --git a/ci-scripts/docker/Dockerfile.ci.ubuntu b/ci-scripts/docker/Dockerfile.ci.ubuntu
index 4d959f3db0811a86f85920bac795324a6747e7eb..32509cf300757c9719631c4a3cee1efecafa6a3c 100644
--- a/ci-scripts/docker/Dockerfile.ci.ubuntu
+++ b/ci-scripts/docker/Dockerfile.ci.ubuntu
@@ -64,7 +64,7 @@ RUN apt-get update && \
 # Ubuntu 18 --> libasan4
 # Ubuntu 20 --> libasan5
 # Ubuntu 22 --> libasan6
-      libasan? \
+#      libasan? \
       libconfig++9v5 \
 # Ubuntu 18 --> libnettle6
 # Ubuntu 20 --> libnettle7
diff --git a/docker/Dockerfile.nef.rhel8 b/docker/Dockerfile.nef.rhel8
index b6d0c7b21929adf67e09e27cbadc9ddf36f92e40..5df149bd89f3a6d4752ecf1b4e49ad53ab8f1134 100644
--- a/docker/Dockerfile.nef.rhel8
+++ b/docker/Dockerfile.nef.rhel8
@@ -90,7 +90,7 @@ RUN rm -f /etc/rhsm-host && \
     microdnf update -y && \
     microdnf install -y \
       tzdata \
-      libasan \
+#      libasan \
       procps-ng \
       psmisc \
       net-tools \
diff --git a/docker/Dockerfile.nef.ubuntu b/docker/Dockerfile.nef.ubuntu
index 8a412b8f043aa2457bb0b3336013afd057033303..364adfc8cbd9c4c9b671a049c0bc714fd9b4e133 100644
--- a/docker/Dockerfile.nef.ubuntu
+++ b/docker/Dockerfile.nef.ubuntu
@@ -85,7 +85,7 @@ RUN apt-get update && \
 # Ubuntu 18 --> libasan4
 # Ubuntu 20 --> libasan5
 # Ubuntu 22 --> libasan6
-      libasan? \
+#      libasan? \
       libconfig++9v5 \
 # Ubuntu 18 --> libnettle6
 # Ubuntu 20 --> libnettle7
diff --git a/src/oai-nef/CMakeLists.txt b/src/oai-nef/CMakeLists.txt
index 328a06b4e6d10a991b0d1b261c9f111c20aff869..0ee5a3d0ea3ee328c77a5623dbf6cab02757341f 100644
--- a/src/oai-nef/CMakeLists.txt
+++ b/src/oai-nef/CMakeLists.txt
@@ -125,7 +125,7 @@ if (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
   SET(ASAN asan)
 endif()
 if (CMAKE_BUILD_TYPE STREQUAL "Release")
-  SET(ASAN asan)
+  Message("no more asan in Release Mode")
 endif()
 if (CMAKE_BUILD_TYPE STREQUAL "Debug")
   add_boolean_option(LOG_OAI True "Thread safe logging API")
diff --git a/src/oai-nef/main.cpp b/src/oai-nef/main.cpp
index 12eda7348903acec0efc1e43dc860a0bb1271159..36049ac8b8b23d94bb0ee1ac7451749e25a97637 100644
--- a/src/oai-nef/main.cpp
+++ b/src/oai-nef/main.cpp
@@ -80,11 +80,8 @@ int main(int argc, char** argv) {
   Logger::init("nef", Options::getlogStdout(), Options::getlogRotFilelog());
   Logger::nef_app().startup("Options parsed");
 
-  struct sigaction sigIntHandler;
-  sigIntHandler.sa_handler = my_app_signal_handler;
-  sigemptyset(&sigIntHandler.sa_mask);
-  sigIntHandler.sa_flags = 0;
-  sigaction(SIGINT, &sigIntHandler, NULL);
+  std::signal(SIGTERM, my_app_signal_handler);
+  std::signal(SIGINT, my_app_signal_handler);
 
   // Config
   nef_cfg.load(Options::getlibconfigConfig());