diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml
index da4f5e0..9c4d0f8 100644
--- a/.github/workflows/build-and-release.yaml
+++ b/.github/workflows/build-and-release.yaml
@@ -244,14 +244,14 @@ jobs:
           docker run --rm \
             -v ${PWD}:/workdir/project \
             -v ${PWD}/mqtt-light-bulb:/workdir/nrf \
-            -w /workdir/nrf/samples/net/mqtt \
+            -w /workdir/nrf/samples/net/mqtt-lightbulb \
             nordicplayground/nrfconnect-sdk:main \
             west build \
               -p always \
               -b thingy91_nrf9160_ns \
               --build-dir /workdir/project/build \
               -- \
-                -DOVERLAY_CONFIG="/workdir/nrf/samples/net/mqtt/overlay-tls-nrf9160.conf;/workdir/project/light-bulb.conf;/workdir/project/firmware.conf" \
+                -DOVERLAY_CONFIG="/workdir/nrf/samples/net/mqtt-lightbulb/overlay-tls-nrf9160.conf;/workdir/project/light-bulb.conf;/workdir/project/firmware.conf" \
                 -DEXTRA_CFLAGS="-Werror"
 
       - run: cat firmware/firmware.conf
diff --git a/mqtt-light-bulb b/mqtt-light-bulb
index 15f620c..311df64 160000
--- a/mqtt-light-bulb
+++ b/mqtt-light-bulb
@@ -1 +1 @@
-Subproject commit 15f620cdacc2c1fc294bfe3a7bf950ef1a4a8489
+Subproject commit 311df6480dbd94b15affd62c362e4f3d77ec6bd9