diff --git a/examples/lock-app/esp32/main/Button.cpp b/examples/lock-app/esp32/main/Button.cpp
index b80e124523f893..2e3aafa4db2116 100644
--- a/examples/lock-app/esp32/main/Button.cpp
+++ b/examples/lock-app/esp32/main/Button.cpp
@@ -27,6 +27,14 @@ esp_err_t Button::Init(gpio_num_t gpioNum, uint16_t debouncePeriod)
     mState           = false;
     mLastPolledState = false;
 
+    gpio_config_t io_conf = {};
+    io_conf.intr_type     = GPIO_INTR_NEGEDGE;
+    io_conf.pin_bit_mask  = 1ULL << gpioNum;
+    io_conf.mode          = GPIO_MODE_INPUT;
+    io_conf.pull_down_en  = GPIO_PULLDOWN_ENABLE;
+
+    gpio_config(&io_conf);
+
     return gpio_set_direction(gpioNum, GPIO_MODE_INPUT);
 }
 
diff --git a/src/app/tests/suites/certification/Test_TC_S_2_3.yaml b/src/app/tests/suites/certification/Test_TC_S_2_3.yaml
index ad72268b4b8961..156bf45579e400 100644
--- a/src/app/tests/suites/certification/Test_TC_S_2_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_S_2_3.yaml
@@ -197,8 +197,7 @@ tests:
           "Step 2: TH sends a AddScene command to DUT with the GroupID field set
           to G1, the SceneID field set to 0x01, the TransitionTime field set to
           0x0001 (1s) and a set of extension fields appropriate to AC1."
-      # This step is overwriting Step 2a, we need to add PICS !S.S.C40.Rsp here, see issue: https://github.com/CHIP-Specifications/chip-test-plans/issues/3509
-      PICS: S.S.C00.Rsp && !S.S.C40.Rsp && PICS_SDK_CI_ONLY
+      PICS: S.S.C00.Rsp && PICS_SDK_CI_ONLY
       command: "AddScene"
       arguments:
           values:
@@ -284,8 +283,7 @@ tests:
           [1670970505.890774][5742:5744] CHIP:TOO:    }
       cluster: "LogCommands"
       command: "UserPrompt"
-      # This step is overwriting Step 2a, we need to add PICS !S.S.C40.Rsp here, see issue: https://github.com/CHIP-Specifications/chip-test-plans/issues/3509
-      PICS: S.S.C00.Rsp && !S.S.C40.Rsp && PICS_SKIP_SAMPLE_APP
+      PICS: S.S.C00.Rsp && PICS_SKIP_SAMPLE_APP
       arguments:
           values:
               - name: "message"
@@ -299,8 +297,7 @@ tests:
     - label:
           "Step 3: TH sends a ViewScene command to DUT with the GroupID field
           set to G1 and the SceneID field set to 0x01."
-      # This step is redundant with Step 3a, we should add PICS !S.S.C41.Rsp here, see issue: https://github.com/CHIP-Specifications/chip-test-plans/issues/3509
-      PICS: S.S.C01.Rsp && !S.S.C41.Rsp && PICS_SDK_CI_ONLY
+      PICS: S.S.C01.Rsp && PICS_SDK_CI_ONLY
       command: "ViewScene"
       arguments:
           values:
@@ -336,8 +333,7 @@ tests:
     - label:
           "Step 3: TH sends a ViewScene command to DUT with the GroupID field
           set to G1 and the SceneID field set to 0x01."
-      # This step is redundant with Step 3a, we should add PICS !S.S.C41.Rsp here, see issue: https://github.com/CHIP-Specifications/chip-test-plans/issues/3509
-      PICS: S.S.C01.Rsp && !S.S.C41.Rsp && PICS_SKIP_SAMPLE_APP
+      PICS: S.S.C01.Rsp && PICS_SKIP_SAMPLE_APP
       verification: |
           Execute the following command in TH to generate the pre-condition to execute this test case: