diff --git a/CHANGELOG.md b/CHANGELOG.md
index 746e3b3d..789bdbca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,9 +4,30 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [3.0.5v2](https://github.com/rdkcentral/sysint/compare/3.0.6...3.0.5v2)
+
+- RDKEMW-8677:Clean up the mitigation done for dnsmasq restart [`#327`](https://github.com/rdkcentral/sysint/pull/327)
+- RDKEMW-8748: Bring RDKTV-38567 changes to develop and release/8.3.4.0 [`a294dcb`](https://github.com/rdkcentral/sysint/commit/a294dcb6b228d0d181ce67ec91f4628fe27e1dc1)
+- 3.0.5v1 hotfix release [`159602e`](https://github.com/rdkcentral/sysint/commit/159602effeeaf80f45f8bfa03a92e2e7628c1f38)
+
+#### [3.0.6](https://github.com/rdkcentral/sysint/compare/3.0.5...3.0.6)
+
+> 29 September 2025
+
+- Deploy fossid_integration_stateless_diffscan_target_repo action [`#323`](https://github.com/rdkcentral/sysint/pull/323)
+- RDKTV-38567: PAT_EntOS_A4K-Soft Reboot failed from settings; Stuck on Black screen [`#311`](https://github.com/rdkcentral/sysint/pull/311)
+- Deploy cla action [`#203`](https://github.com/rdkcentral/sysint/pull/203)
+- Update CODEOWNERS [`#308`](https://github.com/rdkcentral/sysint/pull/308)
+- Delete lib/rdk/rebootSTB.sh [`6e2026e`](https://github.com/rdkcentral/sysint/commit/6e2026e6d73031dadb29879510c48d99bca3d697)
+- Delete systemd_units/scheduled-reboot.service [`f3f5062`](https://github.com/rdkcentral/sysint/commit/f3f50625007a8d5ca9f0e3eebd8fefd441c11d73)
+- RDKEMW-8560 Remove schedule reboot and move reboot to background execution [`38206e1`](https://github.com/rdkcentral/sysint/commit/38206e19435885f6f74d7edb6365615f6ef8071d)
+
 #### [3.0.5](https://github.com/rdkcentral/sysint/compare/3.0.4...3.0.5)
 
+> 19 September 2025
+
 - RDKEMW-8359: Removed nmcli connect with WIFI in the bootstrap [`#299`](https://github.com/rdkcentral/sysint/pull/299)
+- 3.0.5 release changelog updates [`1a8da04`](https://github.com/rdkcentral/sysint/commit/1a8da04a1abee277584910fce197bf4c4a6d963b)
 - Merge tag '3.0.4' into develop [`0f001ba`](https://github.com/rdkcentral/sysint/commit/0f001ba7961a088bd1b568dcc4d226f63125be54)
 
 #### [3.0.4](https://github.com/rdkcentral/sysint/compare/3.0.3...3.0.4)
diff --git a/etc/device.properties b/etc/device.properties
index 2813d1f4..288d889a 100644
--- a/etc/device.properties
+++ b/etc/device.properties
@@ -26,3 +26,4 @@ UDHCP_INTERFACE=eth0
 WAN_INTERFACE=eth0
 WIFI_INTERFACE=wlan0
 WIFI_SUPPORT=true
+LABSIGNED_ENABLED=false
diff --git a/lib/rdk/NM_Dispatcher.sh b/lib/rdk/NM_Dispatcher.sh
index 9b6fcbfc..cfaa0726 100644
--- a/lib/rdk/NM_Dispatcher.sh
+++ b/lib/rdk/NM_Dispatcher.sh
@@ -144,18 +144,6 @@ if [ "x$interfaceName" != "x" ] && [ "$interfaceName" != "lo" ]; then
         checkDefaultRoute_Add  $imode $interfaceName $ipaddr $gwip $interfaceName "metric" "add"
         NMdispatcherLog "checkDefaultRoute_Add"
     fi
-    # Restart dnsmasq if it's running under NetworkManager
-    DNSMASQ_PID_FILE="/var/run/NetworkManager/dnsmasq.pid"
-    
-    if [ -f "$DNSMASQ_PID_FILE" ]; then
-        DNSMASQ_PID=$(cat "$DNSMASQ_PID_FILE")
-        if [ -n "$DNSMASQ_PID" ]; then
-            echo "$DT_TIME Killing dnsmasq PID $DNSMASQ_PID" >> /opt/logs/NMMonitor.log
-            kill -TERM "$DNSMASQ_PID"
-        else
-            echo "$DT_TIME dnsmasq PID not running or invalid" >> /opt/logs/NMMonitor.log
-        fi
-    fi
     if [ "$interfaceName" == "wlan0" ]; then
         touch /tmp/wifi-on
     fi
diff --git a/lib/rdk/rebootNow.sh b/lib/rdk/rebootNow.sh
index e93dceb8..6663e448 100755
--- a/lib/rdk/rebootNow.sh
+++ b/lib/rdk/rebootNow.sh
@@ -472,21 +472,18 @@ rebootLog "End of the sync"
 
 rebootLog "Creating $REBOOTNOW_FLAG as the reboot was triggred by RDK software"
 touch $REBOOTNOW_FLAG
-rebootLog "Rebooting the Device Now"
 rm -rf $pid_file
-reboot
 
-sleep 15
+rebootLog "Rebooting the Device Now"
+reboot &
+REBOOT_PID=$!
 
-rebootLog "System still running after reboot command, Reboot Failed..."
-rebootLog "Invoking Systemctl Reboot After First Reboot Attempt Failure"
+sleep 90
+rebootLog "System still running after reboot command, Reboot Failed for $REBOOT_PID..."
 systemctl reboot
 if [ $? -eq 1 ]; then
-    rebootLog "Reboot failed due to systemctl hang or connection timeout, trying force reboot..."
-    if [ -f /tmp/systemd_freeze_reboot_on ]; then
-        rebootLog "Force Reboot due to systemd freeze detection"
-    else
-        rebootLog "Force Reboot after systemd reboot failure"
-    fi
-    reboot -f
+    rebootLog "Reboot failed due to systemctl hang or connection timeout"
 fi
+kill $REBOOT_PID 2>/dev/null
+rebootLog "Triggering force Reboot after standard soft reboot failure"
+reboot -f
diff --git a/lib/rdk/rebootSTB.sh b/lib/rdk/rebootSTB.sh
deleted file mode 100755
index 5d004831..00000000
--- a/lib/rdk/rebootSTB.sh
+++ /dev/null
@@ -1,130 +0,0 @@
-#!/bin/sh
-##############################################################################
-# If not stated otherwise in this file or this component's LICENSE file the
-# following copyright and licenses apply:
-#
-# Copyright 2020 RDK Management
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##############################################################################
-
-
-. /etc/include.properties
-. /etc/device.properties
-. $RDK_PATH/utils.sh
-
-Timestamp()
-{
-    /bin/timestamp
-}
-
-REBOOTLOG="$LOG_PATH/reboot.log"
-## Sleep for 30 minutes, to make sure all the times are correct on the STB
-echo `Timestamp` 'Initial sleep for 30 minutes, for time to be set correctly on STB'>>$REBOOTLOG;
-sleep 1800
-
-#check if AutoReboot Maintenance Window is Enabled
-if [ "$DEVICE_TYPE" = "hybrid" ] || [ "$DEVICE_TYPE" = "mediaclient" ]; then
-    AutoReboot=$(tr181Set Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.AutoReboot.Enable 2>&1 > /dev/null)
-    if [ "$AutoReboot" = "true" ]; then
-        echo `Timestamp` 'Aborting the rebootSTB Operation as AutoReboot.Enable is True'>>$REBOOTLOG;
-        exit
-    fi
-fi
-
-if [ "$DEVICE_TYPE" = "mediaclient" ] && [ -f $RDK_PATH/networkCommnCheck.sh ]; then
-     echo "Verifying the network and the gateway for Communication"
-     sh $RDK_PATH/networkCommnCheck.sh
-     sleep 1
-fi
-#Default param values
-rebootWindowMins=30
-timeToReboot="07:30"  #Time in UTC
-rebootInt=144
-
-if [ -f $PERSISTENT_PATH/.autoRebootParams.sh ] && [ "$BUILD_TYPE" != "prod" ] ; then
-    chmod 777 $PERSISTENT_PATH/.autoRebootParams.sh
-    . $PERSISTENT_PATH/.autoRebootParams.sh
-
-    ## Random time between RebootWStartTime and RebootWindow in mins
-    if [ $RebootWStartTimeUTC -ge 0 ] ; then
-        if [ $RebootWindowHours -gt 0 ] ; then
-            rebootWindowMins=`expr $RebootWindowHours \* 60`
-        fi
-        timeToReboot=`echo $RebootWStartTimeUTC":00"`
-    fi  
-    if [ $RebootIntervalHours -ge 0 ] ; then
-        rebootInt=$RebootIntervalHours
-    fi
-fi
-  
-echo `Timestamp` 'rebootWindowMins' $rebootWindowMins ' timeToReboot' $timeToReboot ' rebootInt' $rebootInt 'hours'>>$REBOOTLOG;
-rTime=`expr $RANDOM % $rebootWindowMins`
-echo `Timestamp` 'Sleeping for an additional ' $rTime ' minutes'>>$REBOOTLOG;
-
-## Minimum time to reboot in minutes
-minTime=60
-
-## Calculating time to reboot in seconds
-start_time=`date +%H:%M:%S`
-rebootIntSecs=`expr $rebootInt \* 3600`
-start_hour=`echo $start_time | cut -d':' -f1`
-start_min=`echo $start_time | cut -d':' -f2`
-end_hour=`echo $timeToReboot | cut -d':' -f1`
-end_min=`echo $timeToReboot | cut -d':' -f2`
-hour=`expr $end_hour - $start_hour`
-min=`expr $end_min - $start_min`
-
-if [ $min -lt 0 ]
-then
-    min=`expr $min + 60`
-    hour=`expr $hour - 1`
-fi
-
-if [ $hour -lt 0 ]
-then
-    hour=`expr $hour + 24`
-fi
-
-hour_min=`expr $hour \* 60`
-
-## Modified to include random time
-tot_min=`expr $hour_min + $min + $rTime`
-                                   
-## Sleep for remaining time or next day the same time
-if [ $tot_min -lt $minTime ]                 
-then                                         
-     tot_min=`expr $tot_min + 1440`             
-     seconds=`expr $tot_min \* 60`              
-else                                         
-     seconds=`expr $tot_min \* 60`              
-fi    
-
-## Calculate additional time based on rebootInterval
-echo 'rebootIntSecs' $rebootIntSecs ' seconds' $seconds>>$REBOOTLOG;
-while [ $rebootIntSecs -ge $seconds ] 
-do 
-    seconds=`expr $seconds + 86400` 
-done                              
-                                                     
-## Sleep for the time in seconds                     
-echo `Timestamp` 'The box will reboot in ' $seconds ' seconds'>>$REBOOTLOG;
-sleep $seconds                                                                       
-
-## Rebooting the box                                                                         
-echo `Timestamp` 'Rebooting the box'>>$REBOOTLOG;
-echo 0 > $PERSISTENT_PATH/.rebootFlag
-echo `/bin/timestamp` ------------ Its a scheduled reboot ----------------- >> $REBOOTLOG
-## reboot the box
-sh /rebootNow.sh -s RebootSTB.sh -r "Scheduled Reboot" -o "Rebooting the box after device triggered Scheduled Reboot..."
-
diff --git a/systemd_units/scheduled-reboot.service b/systemd_units/scheduled-reboot.service
deleted file mode 100644
index 6e02c15c..00000000
--- a/systemd_units/scheduled-reboot.service
+++ /dev/null
@@ -1,30 +0,0 @@
-##############################################################################
-# If not stated otherwise in this file or this component's LICENSE file the
-# following copyright and licenses apply:
-#
-# Copyright 2020 RDK Management
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##############################################################################
-
-[Unit]
-Description=Scheduled Rebooting Service
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/bin/sh -c '/rebootSTB.sh &'
-
-
-[Install]
-WantedBy=multi-user.target