diff --git a/.github/actions/runTestsTaggedAs/action.yaml b/.github/actions/runTestsTaggedAs/action.yaml
index cf9fefc4275..1a3303e7e05 100644
--- a/.github/actions/runTestsTaggedAs/action.yaml
+++ b/.github/actions/runTestsTaggedAs/action.yaml
@@ -36,16 +36,6 @@ runs:
       run: mvn clean install -Pdocker -pl :kapua-assembly-api
       shell: bash
 
-    - name: Dns look-up containers needed for tests - message-broker
-      if: ${{ inputs.needs-docker-images == 'true' }}
-      run: echo "127.0.0.1       message-broker" | sudo tee -a /etc/hosts
-      shell: bash
-
-    - name: Dns look-up containers needed for tests - job-engine
-      if: ${{ inputs.needs-docker-images == 'true' }}
-      run: echo "127.0.0.1       job-engine" | sudo tee -a /etc/hosts
-      shell: bash
-
     - name: Cucumber tests execution step
       if: ${{ inputs.run-junit == 'false' }}
       run: mvn -B -Dgroups='!org.eclipse.kapua.qa.markers.junit.JUnitTests' -Dcucumber.filter.tags="${{ inputs.tag }}" -pl ${TEST_PROJECTS} verify
diff --git a/.github/actions/setUpRunner/action.yaml b/.github/actions/setUpRunner/action.yaml
index 613a18838c2..31495b0e34c 100644
--- a/.github/actions/setUpRunner/action.yaml
+++ b/.github/actions/setUpRunner/action.yaml
@@ -4,6 +4,7 @@ description: |
   - Setup Java 11
   - Setup Node 16
   - Install Swagger CLI
+  - Add entries to /etc/hosts
 runs:
   using: "composite"
   steps:
@@ -20,4 +21,10 @@ runs:
 
     - name: Install Swagger CLI # Installs Swagger CLI to bundle OpenAPI files
       run: 'npm install -g @apidevtools/swagger-cli'
+      shell: bash
+
+    - name: Dns look-up Docker containers needed for tests
+      run: |
+        echo "127.0.0.1       message-broker" | sudo tee -a /etc/hosts
+        echo "127.0.0.1       job-engine"     | sudo tee -a /etc/hosts
       shell: bash
\ No newline at end of file