diff --git a/.github/docker/testing/Dockerfile.testing-plugins-alma8 b/.github/docker/testing/Dockerfile.testing-plugins-alma8
index 2f9d73501..95f11f84b 100644
--- a/.github/docker/testing/Dockerfile.testing-plugins-alma8
+++ b/.github/docker/testing/Dockerfile.testing-plugins-alma8
@@ -62,9 +62,8 @@ gpgkey=https://yum-gpg.centreon.com/RPM-GPG-KEY-CES\n'\
 
 dnf config-manager --add-repo https://packages.centreon.com/rpm-standard/24.10/el8/centreon-24.10.repo
 dnf update -y
-dnf install -y centreon-connector-perl
-dnf install -y centreon-clib
-dnf clean all --enablerepo=*
+dnf install -y centreon-connector-perl centreon-clib
+
 
 mkdir -p /var/lib/centreon/centplugins/
 chmod 777 /var/lib/centreon/centplugins/
diff --git a/.github/docker/testing/Dockerfile.testing-plugins-alma9 b/.github/docker/testing/Dockerfile.testing-plugins-alma9
index 8371fe745..40f8a34f7 100644
--- a/.github/docker/testing/Dockerfile.testing-plugins-alma9
+++ b/.github/docker/testing/Dockerfile.testing-plugins-alma9
@@ -62,11 +62,7 @@ gpgkey=https://yum-gpg.centreon.com/RPM-GPG-KEY-CES\n'\
 # Add Centreon plugins repositories
 dnf config-manager --add-repo https://packages.centreon.com/rpm-standard/24.10/el9/centreon-24.10.repo
 dnf update -y
-dnf clean all --enablerepo=*
-dnf install -y centreon-connector-perl
-dnf install -y centreon-clib
-
-dnf update -y
+dnf install -y centreon-connector-perl centreon-clib
 
 mkdir -p /var/lib/centreon/centplugins/
 chmod 777 /var/lib/centreon/centplugins/
diff --git a/.github/docker/testing/Dockerfile.testing-plugins-bookworm b/.github/docker/testing/Dockerfile.testing-plugins-bookworm
index a1a4a936e..53b2daaaf 100644
--- a/.github/docker/testing/Dockerfile.testing-plugins-bookworm
+++ b/.github/docker/testing/Dockerfile.testing-plugins-bookworm
@@ -22,7 +22,7 @@ EOF
 
 ENV LANG=en_US.utf8
 
-RUN bash <<EOF
+RUN bash -ex <<EOF
 
 # Avoid apt to clean packages cache directory
 rm -f /etc/apt/apt.conf.d/docker-clean
@@ -33,7 +33,7 @@ apt-get install -y python3-dev python3-pip
 rm -rf /usr/lib/python3.11/EXTERNALLY-MANAGED
 pip3 install robotframework robotframework-examples
 # Install snmpsim
-pip3 install snmpsim-lextudio
+pip3 install snmpsim
 
 # Install nodejs
 curl -fsSL https://deb.nodesource.com/setup_21.x | bash - &&\
@@ -50,7 +50,7 @@ echo "deb https://packages.centreon.com/apt-plugins-unstable/ bookworm main" | t
 wget -O- https://apt-key.centreon.com | gpg --dearmor | tee /etc/apt/trusted.gpg.d/centreon.gpg > /dev/null 2>&1
 
 # Update
-apt-get update
+apt-get update -y 
 
 apt-get install -y centreon-clib centreon-connector-perl centreon-plugins
 
@@ -59,6 +59,8 @@ rm -f /etc/apt/sources.list.d/centreon.list
 mkdir -p /var/lib/centreon/centplugins/
 chmod 777 /var/lib/centreon/centplugins/
 
-apt-get clean
+apt-get update -y
+
+apt-get clean -y
 
 EOF
\ No newline at end of file
diff --git a/.github/docker/testing/Dockerfile.testing-plugins-bullseye b/.github/docker/testing/Dockerfile.testing-plugins-bullseye
index 7fa6d943a..36164bc73 100644
--- a/.github/docker/testing/Dockerfile.testing-plugins-bullseye
+++ b/.github/docker/testing/Dockerfile.testing-plugins-bullseye
@@ -5,7 +5,7 @@ FROM ${REGISTRY_URL}/debian:bullseye
 ENV DEBIAN_FRONTEND=noninteractive
 
 # fix locale
-RUN bash -e <<EOF
+RUN bash -ex <<EOF
 
 useradd snmp
 mkdir -p /var/lib/snmp/cert_indexes/
diff --git a/src/os/linux/snmp/plugin.pm b/src/os/linux/snmp/plugin.pm
index c63b83b18..00ecd86ea 100644
--- a/src/os/linux/snmp/plugin.pm
+++ b/src/os/linux/snmp/plugin.pm
@@ -16,7 +16,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
+##
 
 package os::linux::snmp::plugin;
 
diff --git a/tests/os/linux/snmp/arp-connector.robot b/tests/os/linux/snmp/arp-connector.robot
index d885e3824..d074cd962 100644
--- a/tests/os/linux/snmp/arp-connector.robot
+++ b/tests/os/linux/snmp/arp-connector.robot
@@ -3,7 +3,8 @@ Documentation       Check arp table
 
 Resource            ${CURDIR}${/}..${/}..${/}..${/}resources/import.resource
 
-Suite Setup         Ctn Generic Suite Setup
+Suite Setup         Start Connector
+Suite Teardown      Stop Connector
 Test Timeout        120s
 
 
diff --git a/tests/os/linux/snmp/cpu-connector.robot b/tests/os/linux/snmp/cpu-connector.robot
index 9dcc42f8d..d020ad971 100644
--- a/tests/os/linux/snmp/cpu-connector.robot
+++ b/tests/os/linux/snmp/cpu-connector.robot
@@ -4,10 +4,10 @@ Documentation       Check cpu table
 
 Resource            ${CURDIR}${/}..${/}..${/}..${/}resources/import.resource
 
-Suite Setup         Ctn Generic Suite Setup
+Suite Setup         Start Connector
+Suite Teardown      Stop Connector
 Test Timeout        120s
 
-
 *** Variables ***
 ${CMD}      /usr/lib/centreon/plugins/centreon_linux_snmp.pl --plugin=os::linux::snmp::plugin
 
diff --git a/tests/resources/resources.resource b/tests/resources/resources.resource
index a69f1a605..cfd43dbb6 100644
--- a/tests/resources/resources.resource
+++ b/tests/resources/resources.resource
@@ -14,7 +14,7 @@ ${SNMPPORT}             2024
 ${SNMPVERSION}          2c
 ${PERCENT}              %
 ${MOCKOON_LOG_FILE}    /tmp/mockoon.log
-${TIMEOUT}             120
+${TIMEOUT}             30
 
 *** Keywords ***
 Start Mockoon
@@ -54,10 +54,20 @@ Ctn Cleanup Cache
 Ctn Generic Suite Setup
    Ctn Cleanup Cache
    Set Environment Variable    TZ    UTC
+
+Start connector
+   Ctn Cleanup Cache
+   Set Environment Variable    TZ    UTC
    Remove Files    /tmp/connector.output.*
    Remove File     /tmp/connector.log
    Ctn Start Connector
 
+Stop Connector
+   Terminate All Processes
+   Remove Files    /tmp/connector.output.*
+   Remove File     /tmp/connector.log
+   Ctn Stop Connector
+
 Ctn Run Command And Check Result As Regexp
     [Arguments]    ${command}    ${expected_result}
     ${output}    Run    ${command}
@@ -91,9 +101,10 @@ Ctn Verify Command Output
     ...    collapse_spaces=True
 
 Ctn Run Command With Connector And Check Result As Strings
-    [Arguments]    ${tc}    ${command}    ${expected_result}    ${timeout}=5
+    [Arguments]    ${tc}    ${command}    ${expected_result}    ${timeout}=${TIMEOUT}
     Remove File    /tmp/connector.output
     Remove File    /tmp/connector.command.log
+#    Ctn Start Connector
     Ctn Send To Connector    ${tc}    ${command}    ${timeout}
     # 1. Extract the result from the log and write to /tmp/connector.output
     Ctn Extract Result From Log    ${tc}