diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index b1b93e849f..a0a1f80e32 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -14,9 +14,9 @@ name: "CodeQL Advanced"
 on:
   push:
     branches: [ "master" ]
-   pull_request:
+  pull_request:
     branches: [ "master" ]
-   schedule:
+  schedule:
     - cron: '33 5 * * 1'
 
 jobs:
diff --git a/.github/workflows/functional.yml b/.github/workflows/functional.yml
index d0c67da26a..f46576dbe8 100644
--- a/.github/workflows/functional.yml
+++ b/.github/workflows/functional.yml
@@ -62,7 +62,7 @@ jobs:
         # Note we are reusing the same volume (although the extra broker does not require authenticated user). We use a service in the past
         # to implement this (using eclipse-mosquitto:1.6.15) but in eclipse-mosquitto:2.0.11 it seems something in the internal configuration
         # has changed and it doesn't work if we don't provide the configuration files in the volume. Again, feedback is welcome! :)
-        run: docker run -d --name mosquitto -p 1883:1883 -v $(pwd)/test/functionalTest/mosquittoConf:/mosquitto/config:ro eclipse-mosquitto:2.0.11
+        run: docker run -d --name mosquitto-extra -p 1884:1883 -v $(pwd)/test/functionalTest/mosquittoConf:/mosquitto/config:ro eclipse-mosquitto:2.0.11
 
       - name: Run functional test
         run: |