diff --git a/.github/workflows/docker-browser.yml b/.github/workflows/docker-browser.yml
index fe96cd6..cc326d9 100644
--- a/.github/workflows/docker-browser.yml
+++ b/.github/workflows/docker-browser.yml
@@ -40,14 +40,13 @@ jobs:
         image: ghcr.io/thomasnordquist/mqtt-explorer-ui-tests:latest
         ports:
           - 1883:1883
+        entrypoint: /bin/sh
+        args: ["-c", "mosquitto -c /etc/mosquitto/conf.d/default.conf"]
         options: >-
           --health-cmd "mosquitto_sub -t '$SYS/#' -C 1"
           --health-interval 10s
           --health-timeout 5s
           --health-retries 5
-          --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 572b81f..302959c 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -179,14 +179,13 @@ jobs:
         image: ghcr.io/thomasnordquist/mqtt-explorer-ui-tests:latest
         ports:
           - 1883:1883
+        entrypoint: /bin/sh
+        args: ["-c", "mosquitto -c /etc/mosquitto/conf.d/default.conf"]
         options: >-
           --health-cmd "mosquitto_sub -t '$SYS/#' -C 1"
           --health-interval 10s
           --health-timeout 5s
           --health-retries 5
-          --entrypoint mosquitto
-          -c
-          /etc/mosquitto/conf.d/default.conf
     steps:
       - uses: actions/checkout@v4
         with: