diff --git a/Docker/Dockerfile b/Docker/Dockerfile
index 71d6572..c8a8643 100644
--- a/Docker/Dockerfile
+++ b/Docker/Dockerfile
@@ -2,7 +2,7 @@ FROM eclipse-temurin:11-jdk-jammy AS builder
 
 RUN set -ex &&         \
     apt-get update &&  \
-    apt-get install -y git cmake xz-utils python3 python3-serial
+    apt-get install -y git cmake xz-utils python3 python3-serial ninja-build
 
 RUN curl -L "https://downloads.arduino.cc/arduino-1.8.19-linux64.tar.xz" -o /tmp/arduino-ide.tar.xz
 RUN tar -xf /tmp/arduino-ide.tar.xz --directory ~/
@@ -37,8 +37,8 @@ RUN cd /usr/src/nuki_hub/build && \
 RUN set -ex && \
     cd /usr/src/nuki_hub/build && \
     touch file_opts && \
-    cmake -D CMAKE_TOOLCHAIN_FILE=~/Arduino-CMake-Toolchain/Arduino-toolchain.cmake .. && \
-    make
+    cmake -G Ninja -D CMAKE_TOOLCHAIN_FILE=~/Arduino-CMake-Toolchain/Arduino-toolchain.cmake .. && \
+    ninja
 
 FROM builder AS runtime
 
diff --git a/Network.cpp b/Network.cpp
index 5a5bd3c..5375868 100644
--- a/Network.cpp
+++ b/Network.cpp
@@ -1192,13 +1192,13 @@ void Network::publishHASSConfigContinuousMode(char *deviceType, const char *base
                          baseTopic,
                          String("~") + mqtt_topic_lock_continuous_mode,
                          deviceType,
-                         "lock",
+                         "",
                          "",
                          "",
                          String("~") + mqtt_topic_lock_action,
                          {{ "enabled_by_default", "false" },
                           {"state_on", "on"},
-                          {"state_on", "off"},
+                          {"state_off", "off"},
                           {"pl_on", "activateCM"},
                           {"pl_off", "deactivateCM"}});
     }
diff --git a/WebCfgServer.cpp b/WebCfgServer.cpp
index b509ab3..ef6f564 100644
--- a/WebCfgServer.cpp
+++ b/WebCfgServer.cpp
@@ -624,7 +624,15 @@ void WebCfgServer::buildHtml(String& response)
         char lockstateArr[20];
         NukiOpener::lockstateToString(_nukiOpener->keyTurnerState().lockState, lockstateArr);
         printParameter(response, "Nuki Opener paired", _nukiOpener->isPaired() ? ("Yes (BLE Address " + _nukiOpener->getBleAddress().toString() + ")").c_str() : "No");
-        printParameter(response, "Nuki Opener state", lockstateArr);
+                
+        if(_nukiOpener->keyTurnerState().nukiState == NukiOpener::State::ContinuousMode)
+        {
+            printParameter(response, "Nuki Opener state", "Open (Continuous Mode)");
+        }
+        else
+        {
+            printParameter(response, "Nuki Opener state", lockstateArr);
+        }
     }
     printParameter(response, "Firmware", version.c_str(), "/info");