diff --git a/.github/docker/Dockerfile.gorgone-testing-alma8 b/.github/docker/Dockerfile.gorgone-testing-alma8
index 1f53dcaa961..f5fd642a2be 100644
--- a/.github/docker/Dockerfile.gorgone-testing-alma8
+++ b/.github/docker/Dockerfile.gorgone-testing-alma8
@@ -2,7 +2,7 @@ FROM almalinux:8
 
 RUN bash -e <<EOF
 
-dnf install -y dnf-plugins-core zstd curl mariadb iproute
+dnf install -y dnf-plugins-core zstd curl mariadb iproute procps
 dnf install -y https://rpms.remirepo.net/enterprise/remi-release-8.rpm
 dnf config-manager --set-enabled 'powertools'
 dnf -y config-manager --add-repo https://packages.centreon.com/rpm-standard/23.10/el8/centreon-23.10.repo
diff --git a/.github/docker/Dockerfile.gorgone-testing-bullseye b/.github/docker/Dockerfile.gorgone-testing-bullseye
index 776e5ffc36b..5482b1b0feb 100644
--- a/.github/docker/Dockerfile.gorgone-testing-bullseye
+++ b/.github/docker/Dockerfile.gorgone-testing-bullseye
@@ -18,7 +18,7 @@ ENV LANG en_US.utf8
 RUN bash -e <<EOF
 apt-get update
 # Install Robotframework
-apt-get install -y python3 python3-dev python3-pip ca-certificates apt-transport-https software-properties-common wget gnupg2
+apt-get install -y python3 python3-dev python3-pip ca-certificates apt-transport-https software-properties-common wget gnupg2 procps
 pip3 install robotframework robotframework-examples robotframework-databaselibrary pymysql robotframework-requests robotframework-jsonlibrary
 
 echo "deb https://packages.centreon.com/apt-standard-23.10-stable/ $(lsb_release -sc) main" | tee /etc/apt/sources.list.d/centreon.list
diff --git a/gorgone/tests/robot/tests/core/pullwss.robot b/gorgone/tests/robot/tests/core/pullwss.robot
index f678703e770..6b059a820d9 100644
--- a/gorgone/tests/robot/tests/core/pullwss.robot
+++ b/gorgone/tests/robot/tests/core/pullwss.robot
@@ -9,7 +9,7 @@ Test Timeout        220s
 
 *** Test Cases ***
 check one poller can connect to a central gorgone 
-    [Teardown]    Stop Gorgone And Remove Gorgone Config    @{process_list}    #sql_file=${ROOT_CONFIG}push_db_1_poller_delete.sql
+    [Teardown]    Stop Gorgone And Remove Gorgone Config    @{process_list}    sql_file=${ROOT_CONFIG}db_delete_poller.sql
 
     Log To Console    \nStarting the gorgone setup
     Setup Two Gorgone Instances    communication_mode=pullwss    central_name=pullwss_gorgone_central    poller_name=pullwss_gorgone_poller_2
diff --git a/gorgone/tests/robot/tests/core/push.robot b/gorgone/tests/robot/tests/core/push.robot
index 5ad63f731d9..2b72e39970e 100644
--- a/gorgone/tests/robot/tests/core/push.robot
+++ b/gorgone/tests/robot/tests/core/push.robot
@@ -9,7 +9,7 @@ Test Timeout        220s
 
 *** Test Cases ***
 connect 1 poller to a central
-    [Teardown]    Stop Gorgone And Remove Gorgone Config    @{process_list}    sql_file=${ROOT_CONFIG}push_db_1_poller_delete.sql
+    [Teardown]    Stop Gorgone And Remove Gorgone Config    @{process_list}    sql_file=${ROOT_CONFIG}db_delete_poller.sql
 
     Log To Console    \nStarting the gorgone setup
     Setup Two Gorgone Instances    communication_mode=push_zmq     central_name=push_zmq_gorgone_central    poller_name=push_zmq_gorgone_poller_2
diff --git a/gorgone/tests/robot/tests/long_tests/fd-leak.robot b/gorgone/tests/robot/tests/long_tests/fd-leak.robot
index 468fd0d4f67..39ee7adb6f1 100644
--- a/gorgone/tests/robot/tests/long_tests/fd-leak.robot
+++ b/gorgone/tests/robot/tests/long_tests/fd-leak.robot
@@ -7,15 +7,15 @@ Test Timeout        1200s
 *** Test Cases ***
 check gorgone proxy do not leak file descriptor
     [Tags]    long_tests
-    [Teardown]    Stop Gorgone And Remove Gorgone Config    push_gorgone_central    sql_file=${ROOT_CONFIG}db_delete_poller.sql
+    [Teardown]    Stop Gorgone And Remove Gorgone Config    push_gorgone_central_no_poller    sql_file=${ROOT_CONFIG}db_delete_poller.sql
 
     Log To Console    \nStarting the gorgone setup
         @{central_push_config}=    Create List    ${push_central_config}    ${gorgone_core_config}
 
-        Setup Gorgone Config    @{central_push_config}    gorgone_name=push_gorgone_central    sql_file=${ROOT_CONFIG}db_add_1_poller.sql
-
-    Start Gorgone    debug    push_gorgone_central
+        Setup Gorgone Config    @{central_push_config}    gorgone_name=push_gorgone_central_no_poller    sql_file=${ROOT_CONFIG}db_add_1_poller.sql
 
+    Start Gorgone    debug    push_gorgone_central_no_poller
+    
     # We wait for gorgone to be ready, and grab all file descriptor it need.    
     Sleep    20 
     
@@ -35,9 +35,35 @@ check gorgone proxy do not leak file descriptor
         Sleep    5
     END
 
-    # disconnect the poller
+check gorgone proxy do not leak file descriptor
+    [Tags]    long_tests
+    [Teardown]    Stop Gorgone And Remove Gorgone Config    push_zmq_gorgone_central    sql_file=${ROOT_CONFIG}db_delete_poller.sql
+    ${cmd_count_file_descriptor}=    Set Variable    count=0; for pid in \$(ps aux | grep gorgone-proxy | grep -v grep | awk '{ print \$2 }') ; do num=\$(lsof | grep \$pid | wc -l); count=\$((count + \$num)) ; done ; echo \$count
+    
+    Log To Console    \nStarting the gorgone setup
+    Setup Two Gorgone Instances    communication_mode=push_zmq     central_name=push_zmq_gorgone_central    poller_name=push_zmq_gorgone_poller_2
+    # We wait for gorgone to be ready, and grab all file descriptor it need.
+    Sleep    10
+    ${before_kill_fd_nb}    Run    ${cmd_count_file_descriptor}
+    Stop Gorgone And Remove Gorgone Config    push_gorgone_poller_2
+    Sleep    10
+    # check what is the normal number of file descriptor for gorgone to take
+    ${initial_fd_nb}    Run    ${cmd_count_file_descriptor}
+    Log To Console    \n number of file descriptor on before killing poller : ${before_kill_fd_nb} and after : ${initial_fd_nb} \n
+    ${max}=    Evaluate    ${initial_fd_nb} + 15
+    Log To Console    max is ${max}
+    Sleep    20
+    FOR    ${i}    IN RANGE    60
+        ${current_fd_nb}    Run    ${cmd_count_file_descriptor}
+        IF    ${i} % 10 == 0
+            Log To Console    exec ${i} \t got ${current_fd_nb}
+        END
+        Should Be True    ${max} > ${current_fd_nb}    gorgone is using more and more file descriptor after a poller disconnect, starting at ${initial_fd_nb} and after ${i} iteration (5 sec each) to ${current_fd_nb}
+        Sleep    5
+    END
+
+
 
-    Log To Console    End of tests.
 *** Keywords ***
 
 Start And Stop a Gorgone