diff --git a/.github/workflows/docker-browser.yml b/.github/workflows/docker-browser.yml
index 20fa97e..fe96cd6 100644
--- a/.github/workflows/docker-browser.yml
+++ b/.github/workflows/docker-browser.yml
@@ -37,7 +37,7 @@ jobs:
     services:
       # MQTT broker for testing
       mosquitto:
-        image: eclipse-mosquitto:2
+        image: ghcr.io/thomasnordquist/mqtt-explorer-ui-tests:latest
         ports:
           - 1883:1883
         options: >-
@@ -45,8 +45,9 @@ jobs:
           --health-interval 10s
           --health-timeout 5s
           --health-retries 5
-          --entrypoint sh
-        cmd: -c "mkdir -p /mosquitto/config && echo 'listener 1883' > /mosquitto/config/mosquitto.conf && echo 'allow_anonymous true' >> /mosquitto/config/mosquitto.conf && exec mosquitto -c /mosquitto/config/mosquitto.conf"
+          --entrypoint mosquitto
+          -c
+          /etc/mosquitto/conf.d/default.conf
 
     steps:
       - name: Checkout repository
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 3ab77dd..572b81f 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -176,7 +176,7 @@ jobs:
       TESTS_MQTT_BROKER_PORT: 1883
     services:
       mosquitto:
-        image: eclipse-mosquitto:2
+        image: ghcr.io/thomasnordquist/mqtt-explorer-ui-tests:latest
         ports:
           - 1883:1883
         options: >-
@@ -184,8 +184,9 @@ jobs:
           --health-interval 10s
           --health-timeout 5s
           --health-retries 5
-          --entrypoint sh
-        cmd: -c "mkdir -p /mosquitto/config && echo 'listener 1883' > /mosquitto/config/mosquitto.conf && echo 'allow_anonymous true' >> /mosquitto/config/mosquitto.conf && exec mosquitto -c /mosquitto/config/mosquitto.conf"
+          --entrypoint mosquitto
+          -c
+          /etc/mosquitto/conf.d/default.conf
     steps:
       - uses: actions/checkout@v4
         with: