diff --git a/.github/actions/runTestsTaggedAs/action.yaml b/.github/actions/runTestsTaggedAs/action.yaml
index 4090773b354..472fe15a080 100644
--- a/.github/actions/runTestsTaggedAs/action.yaml
+++ b/.github/actions/runTestsTaggedAs/action.yaml
@@ -35,12 +35,8 @@ runs:
       run: echo "127.0.0.1       job-engine" | sudo tee -a /etc/hosts
       shell: bash
     - name: Test execution step
-      uses: nick-fields/retry@v2.8.1
-      with:
-        timeout_minutes: 45
-        retry_on: error
-        max_attempts: 1
-        command: ./ci-output.sh mvn -B ${BUILD_OPTS} ${CONFIG_OVERRIDES} -Dgroups='!org.eclipse.kapua.qa.markers.junit.JUnitTests' -Dcucumber.filter.tags="${{ inputs.tag }}" -pl ${TEST_PROJECTS} verify
+      run: ./ci-output.sh mvn -B ${BUILD_OPTS} ${CONFIG_OVERRIDES} -Dgroups='!org.eclipse.kapua.qa.markers.junit.JUnitTests' -Dcucumber.filter.tags="${{ inputs.tag }}" -pl ${TEST_PROJECTS} verify
+      shell: bash
     - name: Code-coverage results
       run: bash <(curl -s https://codecov.io/bash)
       shell: bash
\ No newline at end of file
diff --git a/.github/workflows/kapua-ci.yaml b/.github/workflows/kapua-ci.yaml
index 214f2c7bcc4..45c9fa4d43b 100755
--- a/.github/workflows/kapua-ci.yaml
+++ b/.github/workflows/kapua-ci.yaml
@@ -7,11 +7,13 @@ env: #the last 2 env variables defines respectively the maven projects were cucu
   MAVEN_OPTS: "-Xmx4096m"
   TEST_PROJECTS: "org.eclipse.kapua:kapua-security-test,org.eclipse.kapua:kapua-qa-integration,org.eclipse.kapua:kapua-scheduler-test,org.eclipse.kapua:kapua-user-test,org.eclipse.kapua:kapua-system-test,org.eclipse.kapua:kapua-job-test,org.eclipse.kapua:kapua-device-registry-test,org.eclipse.kapua:kapua-account-test,org.eclipse.kapua:kapua-tag-test,org.eclipse.kapua:kapua-translator-test"
   APP_PROJECTS: "org.eclipse.kapua:kapua-service-authentication-app,org.eclipse.kapua:kapua-consumer-lifecycle-app,org.eclipse.kapua:kapua-consumer-telemetry-app"
+  TIMEOUT_JOBS: "45"
 
 jobs:
   build:
     name: Build
     runs-on: ubuntu-latest
+    timeout-minutes: ${{TIMEOUT_JOBS}}
     steps:
       - uses: actions/checkout@v3 # Checks out a copy of the repository on the ubuntu-latest machine
       - uses: actions/setup-java@v3
@@ -29,6 +31,7 @@ jobs:
   test-brokerAcl:
     needs: build
     runs-on: ubuntu-latest
+    timeout-minutes: ${{TIMEOUT_JOBS}}
     steps:
       - name: Clones Kapua repo inside the runner
         uses: actions/checkout@v3
@@ -39,6 +42,7 @@ jobs:
   test-tag:
     needs: build
     runs-on: ubuntu-latest
+    timeout-minutes: ${{TIMEOUT_JOBS}}
     steps:
       - name: Clones Kapua repo inside the runner
         uses: actions/checkout@v3
@@ -49,6 +53,7 @@ jobs:
   test-broker:
     needs: build
     runs-on: ubuntu-latest
+    timeout-minutes: ${{TIMEOUT_JOBS}}
     steps:
       - name: Clones Kapua repo inside the runner
         uses: actions/checkout@v3
@@ -59,6 +64,7 @@ jobs:
   test-device:
     needs: build
     runs-on: ubuntu-latest
+    timeout-minutes: ${{TIMEOUT_JOBS}}
     steps:
       - name: Clones Kapua repo inside the runner
         uses: actions/checkout@v3
@@ -69,6 +75,7 @@ jobs:
   test-device-management:
     needs: build
     runs-on: ubuntu-latest
+    timeout-minutes: ${{TIMEOUT_JOBS}}
     steps:
       - name: Clones Kapua repo inside the runner
         uses: actions/checkout@v3
@@ -79,6 +86,7 @@ jobs:
   test-connection:
     needs: build
     runs-on: ubuntu-latest
+    timeout-minutes: ${{TIMEOUT_JOBS}}
     steps:
       - name: Clones Kapua repo inside the runner
         uses: actions/checkout@v3
@@ -89,6 +97,7 @@ jobs:
   test-datastore:
     needs: build
     runs-on: ubuntu-latest
+    timeout-minutes: ${{TIMEOUT_JOBS}}
     steps:
       - name: Clones Kapua repo inside the runner
         uses: actions/checkout@v3
@@ -99,6 +108,7 @@ jobs:
   test-user:
     needs: build
     runs-on: ubuntu-latest
+    timeout-minutes: ${{TIMEOUT_JOBS}}
     steps:
       - name: Clones Kapua repo inside the runner
         uses: actions/checkout@v3
@@ -109,6 +119,7 @@ jobs:
   test-userIntegrationBase:
     needs: build
     runs-on: ubuntu-latest
+    timeout-minutes: ${{TIMEOUT_JOBS}}
     steps:
       - name: Clones Kapua repo inside the runner
         uses: actions/checkout@v3
@@ -119,6 +130,7 @@ jobs:
   test-userIntegration:
     needs: build
     runs-on: ubuntu-latest
+    timeout-minutes: ${{TIMEOUT_JOBS}}
     steps:
       - name: Clones Kapua repo inside the runner
         uses: actions/checkout@v3
@@ -129,6 +141,7 @@ jobs:
   test-security:
     needs: build
     runs-on: ubuntu-latest
+    timeout-minutes: ${{TIMEOUT_JOBS}}
     steps:
       - name: Clones Kapua repo inside the runner
         uses: actions/checkout@v3
@@ -139,6 +152,7 @@ jobs:
   test-jobsAndScheduler:
     needs: build
     runs-on: ubuntu-latest
+    timeout-minutes: ${{TIMEOUT_JOBS}}
     steps:
       - name: Clones Kapua repo inside the runner
         uses: actions/checkout@v3
@@ -149,6 +163,7 @@ jobs:
   test-jobsIntegrationBase:
     needs: build
     runs-on: ubuntu-latest
+    timeout-minutes: ${{TIMEOUT_JOBS}}
     steps:
       - name: Clones Kapua repo inside the runner
         uses: actions/checkout@v3
@@ -159,6 +174,7 @@ jobs:
   test-jobsIntegration:
     needs: build
     runs-on: ubuntu-latest
+    timeout-minutes: ${{TIMEOUT_JOBS}}
     steps:
       - name: Clones Kapua repo inside the runner
         uses: actions/checkout@v3
@@ -169,6 +185,7 @@ jobs:
   test-accountAndTranslator:
     needs: build
     runs-on: ubuntu-latest
+    timeout-minutes: ${{TIMEOUT_JOBS}}
     steps:
       - name: Clones Kapua repo inside the runner
         uses: actions/checkout@v3
@@ -179,6 +196,7 @@ jobs:
   test-jobEngineStepDefinitions:
     needs: build
     runs-on: ubuntu-latest
+    timeout-minutes: ${{TIMEOUT_JOBS}}
     steps:
       - name: Clones Kapua repo inside the runner
         uses: actions/checkout@v3
@@ -189,6 +207,7 @@ jobs:
   test-jobEngineStartOfflineDevice:
     needs: build
     runs-on: ubuntu-latest
+    timeout-minutes: ${{TIMEOUT_JOBS}}
     steps:
       - name: Clones Kapua repo inside the runner
         uses: actions/checkout@v3
@@ -199,6 +218,7 @@ jobs:
   test-jobEngineStartOnlineDevice:
     needs: build
     runs-on: ubuntu-latest
+    timeout-minutes: ${{TIMEOUT_JOBS}}
     steps:
       - name: Clones Kapua repo inside the runner
         uses: actions/checkout@v3
@@ -209,6 +229,7 @@ jobs:
   test-jobEngineRestartOfflineDevice:
     needs: build
     runs-on: ubuntu-latest
+    timeout-minutes: ${{TIMEOUT_JOBS}}
     steps:
       - name: Clones Kapua repo inside the runner
         uses: actions/checkout@v3
@@ -219,6 +240,7 @@ jobs:
   test-jobEngineRestartOnlineDevice:
     needs: build
     runs-on: ubuntu-latest
+    timeout-minutes: ${{TIMEOUT_JOBS}}
     steps:
       - name: Clones Kapua repo inside the runner
         uses: actions/checkout@v3
@@ -229,6 +251,7 @@ jobs:
   test-jobEngineRestartOnlineDeviceSecondPart:
     needs: build
     runs-on: ubuntu-latest
+    timeout-minutes: ${{TIMEOUT_JOBS}}
     steps:
       - name: Clones Kapua repo inside the runner
         uses: actions/checkout@v3
@@ -239,6 +262,7 @@ jobs:
   test-jobEngineServiceStop:
     needs: build
     runs-on: ubuntu-latest
+    timeout-minutes: ${{TIMEOUT_JOBS}}
     steps:
       - name: Clones Kapua repo inside the runner
         uses: actions/checkout@v3
@@ -249,6 +273,7 @@ jobs:
   test-RoleAndGroup:
     needs: build
     runs-on: ubuntu-latest
+    timeout-minutes: ${{TIMEOUT_JOBS}}
     steps:
       - name: Clones Kapua repo inside the runner
         uses: actions/checkout@v3
@@ -259,6 +284,7 @@ jobs:
   test-deviceRegistry:
     needs: build
     runs-on: ubuntu-latest
+    timeout-minutes: ${{TIMEOUT_JOBS}}
     steps:
       - name: Clones Kapua repo inside the runner
         uses: actions/checkout@v3
@@ -269,6 +295,7 @@ jobs:
   test-endpoint:
     needs: build
     runs-on: ubuntu-latest
+    timeout-minutes: ${{TIMEOUT_JOBS}}
     steps:
       - name: Clones Kapua repo inside the runner
         uses: actions/checkout@v3
@@ -279,6 +306,7 @@ jobs:
   junit-tests:
     needs: build
     runs-on: ubuntu-latest
+    timeout-minutes: ${{TIMEOUT_JOBS}}
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
@@ -289,16 +317,12 @@ jobs:
         with:
           path: ~/.m2/repository
           key: ${{ github.run_id }}-${{ github.run_number }}-maven-cache
-      - uses: nick-fields/retry@v2.8.1
-        with:
-          timeout_minutes: 45
-          retry_on: error
-          max_attempts: 1
-          command: ./ci-output.sh mvn -B ${BUILD_OPTS} ${CONFIG_OVERRIDES} -Dgroups='org.eclipse.kapua.qa.markers.junit.JUnitTests' verify
+      - run: ./ci-output.sh mvn -B ${BUILD_OPTS} ${CONFIG_OVERRIDES} -Dgroups='org.eclipse.kapua.qa.markers.junit.JUnitTests' verify
       - run: bash <(curl -s https://codecov.io/bash)
   build-javadoc:
     needs: build
     runs-on: ubuntu-latest
+    timeout-minutes: ${{TIMEOUT_JOBS}}
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v3