diff --git a/.github/workflows/docker-build-publish.yml b/.github/workflows/docker-build-publish.yml
index e8ed20a69..0b1b44b44 100644
--- a/.github/workflows/docker-build-publish.yml
+++ b/.github/workflows/docker-build-publish.yml
@@ -60,7 +60,7 @@ jobs:
             file: docker/apps/Dockerfile.dps-cloud-server
           - name: dps-cloud-server-debug
             build_type: Debug
-            build_args: -DOC_DEBUG_ENABLED=ON -DOC_LOG_MAXIMUM_LOG_LEVEL=DEBUG -DPLGD_DEV_DEVICE_PROVISIONING_TEST_PROPERTIES_ENABLED=ON
+            build_args: -DOC_DEBUG_ENABLED=ON -DOC_LOG_MAXIMUM_LOG_LEVEL=DEBUG -DPLGD_DEV_DEVICE_PROVISIONING_MAXIMUM_LOG_LEVEL=DEBUG -DPLGD_DPS_CLOUD_SERVER_DBG_ENABLED=ON -DPLGD_DEV_DEVICE_PROVISIONING_TEST_PROPERTIES_ENABLED=ON
             file: docker/apps/Dockerfile.dps-cloud-server
     uses: ./.github/workflows/docker-build-publish-with-cfg.yml
     with:
diff --git a/.github/workflows/plgd-dps-tests.yml b/.github/workflows/plgd-dps-tests.yml
index 0d15538e2..53f3c3d87 100644
--- a/.github/workflows/plgd-dps-tests.yml
+++ b/.github/workflows/plgd-dps-tests.yml
@@ -53,7 +53,7 @@ jobs:
     uses: ./.github/workflows/plgd-dps-test-with-cfg.yml
     with:
         args: ${{ matrix.args || '' }}
-        build_args: -DOC_DEBUG_ENABLED=ON -DPLGD_DPS_MAXIMUM_LOG_LEVEL=TRACE -DPLGD_DPS_CLOUD_SERVER_DBG_ENABLED=ON ${{ matrix.build_args }}
+        build_args: -DOC_DEBUG_ENABLED=ON -DPLGD_DEV_DEVICE_PROVISIONING_MAXIMUM_LOG_LEVEL=TRACE -DPLGD_DEV_DEVICE_PROVISIONING_TEST_PROPERTIES_ENABLED=ON -DPLGD_DPS_CLOUD_SERVER_DBG_ENABLED=ON ${{ matrix.build_args }}
         build_type: ${{ (github.event_name == 'workflow_dispatch' && inputs.build_type) || 'Debug' }}
         docker_file: ${{ matrix.docker_file || 'docker/apps/Dockerfile.dps-cloud-server-debug' }}
         skip: ${{ matrix.skip || false }}
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cc74744d8..0456cdbc5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -426,11 +426,11 @@ if(PLGD_DEV_DEVICE_PROVISIONING_ENABLED)
     endif()
     list(APPEND PUBLIC_COMPILE_DEFINITIONS "PLGD_DEV_DEVICE_PROVISIONING")
 
-    set(PLGD_DPS_MAXIMUM_LOG_LEVEL "DISABLED" CACHE STRING "Maximum supported Plgd DPS log level in compile time.")
-    set(PLGD_DPS_MAXIMUM_LOG_LEVEL_INT)
-    oc_set_maximum_log_level("${PLGD_DPS_MAXIMUM_LOG_LEVEL}" PLGD_DPS_MAXIMUM_LOG_LEVEL_INT)
-    list(APPEND PRIVATE_COMPILE_DEFINITIONS "PLGD_DPS_LOG_MAXIMUM_LEVEL=(${PLGD_DPS_MAXIMUM_LOG_LEVEL_INT})")
-    list(APPEND TEST_COMPILE_DEFINITIONS "PLGD_DPS_LOG_MAXIMUM_LEVEL=(${PLGD_DPS_MAXIMUM_LOG_LEVEL_INT})")
+    set(PLGD_DEV_DEVICE_PROVISIONING_MAXIMUM_LOG_LEVEL "DISABLED" CACHE STRING "Maximum supported Plgd DPS log level in compile time.")
+    set(PLGD_DEV_DEVICE_PROVISIONING_MAXIMUM_LOG_LEVEL_INT)
+    oc_set_maximum_log_level("${PLGD_DEV_DEVICE_PROVISIONING_MAXIMUM_LOG_LEVEL}" PLGD_DEV_DEVICE_PROVISIONING_MAXIMUM_LOG_LEVEL_INT)
+    list(APPEND PRIVATE_COMPILE_DEFINITIONS "PLGD_DPS_LOG_MAXIMUM_LEVEL=(${PLGD_DEV_DEVICE_PROVISIONING_MAXIMUM_LOG_LEVEL_INT})")
+    list(APPEND TEST_COMPILE_DEFINITIONS "PLGD_DPS_LOG_MAXIMUM_LEVEL=(${PLGD_DEV_DEVICE_PROVISIONING_MAXIMUM_LOG_LEVEL_INT})")
 endif()
 
 if(PLGD_DEV_DEVICE_PROVISIONING_TEST_PROPERTIES_ENABLED)
diff --git a/docker/apps/Dockerfile.dps-cloud-server-debug b/docker/apps/Dockerfile.dps-cloud-server-debug
index 26aaef24b..f675c2f19 100644
--- a/docker/apps/Dockerfile.dps-cloud-server-debug
+++ b/docker/apps/Dockerfile.dps-cloud-server-debug
@@ -22,8 +22,7 @@ RUN mkdir build && \
     cd build && \
     cmake -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DOC_CLOUD_ENABLED=ON \
     -DOC_COLLECTIONS_IF_CREATE_ENABLED=ON -DOC_OSCORE_ENABLED=OFF -DOC_DISCOVERY_RESOURCE_OBSERVABLE_ENABLED=ON \
-    -DOC_DEBUG_ENABLED=ON -DPLGD_DEV_TIME_ENABLED=ON -DPLGD_DEV_DEVICE_PROVISIONING_ENABLED=ON \
-    -DPLGD_DEV_DEVICE_PROVISIONING_TEST_PROPERTIES_ENABLED=ON -DBUILD_TESTING=ON ${BUILD_ARGS} .. && \
+    -DPLGD_DEV_TIME_ENABLED=ON -DPLGD_DEV_DEVICE_PROVISIONING_ENABLED=ON -DBUILD_TESTING=ON ${BUILD_ARGS} .. && \
     cmake --build . --target mbedtls mbedx509 mbedcrypto && \
     cmake --build . -j$(nproc) --target dps_cloud_server && \
     cp /device-provisioning-client/build/apps/dps_cloud_server /dps/