diff --git a/.github/workflows/functional.yml b/.github/workflows/functional.yml
index 1823505b16..0081fe0135 100644
--- a/.github/workflows/functional.yml
+++ b/.github/workflows/functional.yml
@@ -27,14 +27,14 @@ jobs:
         ports:
           - 27017:27017
 
-      mosquitto:
-        # Needed by MQTT notification tests
-        image: eclipse-mosquitto:1.6.15
-        ports:
-        - 1883:1883
-        volumes:
-          - ${{ github.workspace}}/test/functionalTest/mosquitto_conf_for_tests.conf:/mosquitto/config/mosquitto.conf
-          - ${{ github.workspace}}/test/functionalTest/mosquitto_passwd:/mosquitto/config/passwd
+      #mosquitto:
+      #  # Needed by MQTT notification tests
+      #  image: eclipse-mosquitto:1.6.15
+      #  ports:
+      #  - 1883:1883
+      #  volumes:
+      #    - ${{ github.workspace}}/test/functionalTest/mosquitto_conf_for_tests.conf:/mosquitto/config/mosquitto.conf
+      #    - ${{ github.workspace}}/test/functionalTest/mosquitto_passwd:/mosquitto/config/passwd
 
       mosquitto-extra:
         # Needed by MQTT notification tests (multi broker)
@@ -61,6 +61,15 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
+      - name: Start Mosquitto
+        uses: namoshek/mosquitto-github-action@v1
+        with:
+          version: '1.6'
+          ports: '1883:1883'
+          config: ${{ github.workspace }}/test/functionalTest/mosquitto_conf_for_tests.conf
+          password-file: ${{ github.workspace}}/test/functionalTest/mosquitto_passwd:/mosquitto/config/passwd
+          container-name: 'mqtt'
+
       - name: Run functional test
         run: |
           docker run  --network host -t --rm -e REPO_ACCESS_TOKEN=${{ secrets.REPO_ACCESS_TOKEN }} ${{ matrix.payload.range }} -v $(pwd):/opt/fiware-orion ${{ env.TEST_IMAGE_NAME }} build -miqts functional