diff --git a/CHANGELOG.md b/CHANGELOG.md
index a2ef8a06..d5c50046 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ list yields a list of all related PRs for each release.
 - Use gpsd version 3.17 now. Includes API changes
 - Add `/usr/local/bin` to PATH. All shell scripts are there now
 - Rename GPS device to `/dev/gps0`
+- Add Syrlinks and TMP devices to Software by default
 
 # [v1.10.1]
 
diff --git a/bsp_q7s/core/ObjectFactory.cpp b/bsp_q7s/core/ObjectFactory.cpp
index ecc88ede..d830fa77 100644
--- a/bsp_q7s/core/ObjectFactory.cpp
+++ b/bsp_q7s/core/ObjectFactory.cpp
@@ -152,7 +152,7 @@ void ObjectFactory::produce(void* args) {
   createSolarArrayDeploymentComponents();
   createPlPcduComponents(gpioComIF, spiComIF, pwrSwitcher);
 #if OBSW_ADD_SYRLINKS == 1
-  createSyrlinksComponents();
+  createSyrlinksComponents(pwrSwitcher);
 #endif /* OBSW_ADD_SYRLINKS == 1 */
   createRtdComponents(q7s::SPI_DEFAULT_DEV, gpioComIF, pwrSwitcher);
   createPayloadComponents(gpioComIF);
diff --git a/linux/fsfwconfig/OBSWConfig.h.in b/linux/fsfwconfig/OBSWConfig.h.in
index 55e6e8c5..4d26f463 100644
--- a/linux/fsfwconfig/OBSWConfig.h.in
+++ b/linux/fsfwconfig/OBSWConfig.h.in
@@ -49,10 +49,10 @@ debugging. */
 #define OBSW_ADD_ACS_HANDLERS                       1
 #define OBSW_ADD_RW                                 0
 #define OBSW_ADD_RTD_DEVICES                        1
-#define OBSW_ADD_TMP_DEVICES                        0
+#define OBSW_ADD_TMP_DEVICES                        1
 #define OBSW_ADD_RAD_SENSORS                        1
 #define OBSW_ADD_PL_PCDU                            1
-#define OBSW_ADD_SYRLINKS                           0
+#define OBSW_ADD_SYRLINKS                           1
 #define OBSW_ENABLE_SYRLINKS_TRANSMIT_TIMEOUT       0
 #define OBSW_STAR_TRACKER_GROUND_CONFIG             1
 
@@ -129,6 +129,8 @@ debugging. */
 #define OBSW_DEBUG_BPX_BATT                         0
 #define OBSW_TEST_IMTQ                              0
 #define OBSW_DEBUG_IMTQ                             0
+#define OBSW_TEST_RW                                0
+#define OBSW_DEBUG_RW                               0
 
 #define OBSW_TEST_LIBGPIOD                          0
 #define OBSW_TEST_PLOC_HANDLER                      0
@@ -145,7 +147,7 @@ debugging. */
 #define OBSW_DEBUG_GPS                              0
 #define OBSW_DEBUG_ACU                              0
 #define OBSW_DEBUG_SYRLINKS                         0
-#define OBSW_DEBUG_RW                               0
+
 #define OBSW_DEBUG_PDEC_HANDLER                     0
 
 #ifdef TE0720_1CFA