diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index e18ce27f..8bb6aa68 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        model: [Shelly1, Shelly1L, Shelly1PM, Shelly25, Shelly2, ShellyColorBulb, ShellyDuo, ShellyI3, ShellyPlug, ShellyPlugS, ShellyPlus1, ShellyPlus1PM, ShellyPlusI4, ShellyRGBW2, ShellyVintage, ShellyUNI]
+        model: [Shelly1, Shelly1L, Shelly1PM, Shelly25, Shelly2, ShellyColorBulb, ShellyDuo, ShellyI3, ShellyPlug, ShellyPlugS, ShellyPlus1, ShellyPlus1PM, ShellyPlusI4, ShellyPlusPlugS, ShellyRGBW2, ShellyVintage, ShellyUNI]
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
diff --git a/mos.yml b/mos.yml
index 45f5df1e..33f9e608 100644
--- a/mos.yml
+++ b/mos.yml
@@ -563,14 +563,12 @@ conds:
 
   - when: build_vars.MODEL == "ShellyPlusPlugS"
     apply:
-      sources:
-        - src/ShellyPlugPlusS/shelly_init.cpp
       name: PlusPlugS
       build_vars:
         MGOS_ROOT_FS_TYPE: LFS
         MGOS_ROOT_FS_SIZE: 458752
         ESP_IDF_EXTRA_PARTITION: "aux,0x55,0x00,0x3f0000,48K"
-        ESP_IDF_EXTRA_PARTITION_2: "shelly,data,nvs,0x3fc000,16K"
+        ESP_IDF_EXTRA_PARTITION_2: "shelly,data,0x88,0x3fc000,16K"
         ESP_IDF_SDKCONFIG_OPTS: >
           ${build_vars.ESP_IDF_SDKCONFIG_OPTS}
             CONFIG_FREERTOS_UNICORE=y
diff --git a/src/ShellyPlugPlusS/shelly_init.cpp b/src/ShellyPlugPlusS/shelly_init.cpp
index 70d2f455..b28c0786 100644
--- a/src/ShellyPlugPlusS/shelly_init.cpp
+++ b/src/ShellyPlugPlusS/shelly_init.cpp
@@ -30,8 +30,8 @@ void CreatePeripherals(std::vector<std::unique_ptr<Input>> *inputs,
                        std::vector<std::unique_ptr<PowerMeter>> *pms,
                        std::unique_ptr<TempSensor> *sys_temp) {
   outputs->emplace_back(new OutputPin(1, 4, 1));
-  outputs->emplace_back(new OutputPin(98, LED_GPIO, 1));  // Red LED.
-  outputs->emplace_back(new OutputPin(99, LED2_GPIO, 1));  // Red LED.
+
+  // GPIO 25 and 26 are neopixel lights
 
   std::unique_ptr<PowerMeter> pm(
       new BL0937PowerMeter(1, 10 /* CF */, 22 /* CF1 */, 19 /* SEL */, 2,
@@ -53,7 +53,7 @@ void CreateComponents(std::vector<std::unique_ptr<Component>> *comps,
                       std::vector<std::unique_ptr<mgos::hap::Accessory>> *accs,
                       HAPAccessoryServerRef *svr) {
   CreateHAPSwitch(1, mgos_sys_config_get_sw1(), nullptr, comps, accs, svr,
-                  true /* to_pri_acc */, FindOutput(99) );
+                  true /* to_pri_acc */, FindOutput(1));
 }
 
 }  // namespace shelly