diff --git a/bsp_q7s/ObjectFactory.cpp b/bsp_q7s/ObjectFactory.cpp
index bbaa5e7c..ab32ec9a 100644
--- a/bsp_q7s/ObjectFactory.cpp
+++ b/bsp_q7s/ObjectFactory.cpp
@@ -144,6 +144,7 @@ void ObjectFactory::produce(){
     (void) pdu2handler;
     (void) acuhandler;
 
+#if OBSW_ADD_ACS_BOARD == 1
     GpioCookie* gpioCookieAcsBoard = new GpioCookie();
     GpiodRegular* gpio = nullptr;
     gpio = new GpiodRegular(std::string("gpiochip5"), 21, std::string("CS_GYRO_1_ADIS"),
@@ -192,6 +193,7 @@ void ObjectFactory::produce(){
     auto gyroL3gHandler = new GyroHandlerL3GD20H(objects::GYRO_1_L3G_HANDLER, objects::SPI_COM_IF,
             spiCookie);
     gyroL3gHandler->setStartUpImmediately();
+#endif
 
     /* Pin H2-11 on stack connector */
     GpiodRegular* gpioConfigHeater0 = new GpiodRegular(std::string("gpiochip7"), 6,
diff --git a/fsfwconfig/OBSWConfig.h b/fsfwconfig/OBSWConfig.h
index 81e61653..a41757e1 100644
--- a/fsfwconfig/OBSWConfig.h
+++ b/fsfwconfig/OBSWConfig.h
@@ -20,12 +20,15 @@ debugging. */
 #define TEST_LIBGPIOD               0
 
 #define TE0720                      0
+/* Add code for ACS board */
+#define OBSW_ADD_ACS_BOARD          1
+
+#define P60DOCK_DEBUG               0
+#define PDU1_DEBUG                  0
+#define PDU2_DEBUG                  0
+#define ACU_DEBUG                   0
+#define SYRLINKS_DEBUG              0
 
-#define P60DOCK_DEBUG   0
-#define PDU1_DEBUG  0
-#define PDU2_DEBUG  0
-#define ACU_DEBUG  0
-#define SYRLINKS_DEBUG  0
 
 #include "OBSWVersion.h"
 
diff --git a/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp b/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp
index ce0b7490..ef11f41e 100644
--- a/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp
+++ b/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp
@@ -1,5 +1,5 @@
 #include "pollingSequenceFactory.h"
-
+#include <OBSWConfig.h>
 #include <fsfw/objectmanager/ObjectManagerIF.h>
 #include <fsfw/serviceinterface/ServiceInterfaceStream.h>
 #include <fsfw/devicehandlers/DeviceHandlerIF.h>
@@ -171,6 +171,7 @@ ReturnValue_t pst::gomspacePstInit(FixedTimeslotTaskIF *thisSequence){
     thisSequence->addSlot(objects::ACU_HANDLER,
             length * 0.8, DeviceHandlerIF::GET_READ);
 
+#if OBSW_ADD_ACS_BOARD == 1
     thisSequence->addSlot(objects::MGM_0_LIS3_HANDLER, length * 0,
                 DeviceHandlerIF::PERFORM_OPERATION);
 	thisSequence->addSlot(objects::MGM_0_LIS3_HANDLER, length * 0.2,
@@ -182,27 +183,39 @@ ReturnValue_t pst::gomspacePstInit(FixedTimeslotTaskIF *thisSequence){
 	thisSequence->addSlot(objects::MGM_0_LIS3_HANDLER, length * 0.8,
 			DeviceHandlerIF::GET_READ);
 
-//	thisSequence->addSlot(objects::MGM_1_RM3100_HANDLER, length * 0,
-//			DeviceHandlerIF::PERFORM_OPERATION);
-//	thisSequence->addSlot(objects::MGM_1_RM3100_HANDLER, length * 0.2,
-//			DeviceHandlerIF::SEND_WRITE);
-//	thisSequence->addSlot(objects::MGM_1_RM3100_HANDLER, length * 0.4,
-//			DeviceHandlerIF::GET_WRITE);
-//	thisSequence->addSlot(objects::MGM_1_RM3100_HANDLER, length * 0.6,
-//			DeviceHandlerIF::SEND_READ);
-//	thisSequence->addSlot(objects::MGM_1_RM3100_HANDLER, length * 0.8,
-//			DeviceHandlerIF::GET_READ);
-//
-//	thisSequence->addSlot(objects::GYRO_1_L3G_HANDLER, length * 0,
-//			DeviceHandlerIF::PERFORM_OPERATION);
-//	thisSequence->addSlot(objects::GYRO_1_L3G_HANDLER, length * 0.2,
-//			DeviceHandlerIF::SEND_WRITE);
-//	thisSequence->addSlot(objects::GYRO_1_L3G_HANDLER, length * 0.4,
-//			DeviceHandlerIF::GET_WRITE);
-//	thisSequence->addSlot(objects::GYRO_1_L3G_HANDLER, length * 0.6,
-//			DeviceHandlerIF::SEND_READ);
-//	thisSequence->addSlot(objects::GYRO_1_L3G_HANDLER, length * 0.8,
-//			DeviceHandlerIF::GET_READ);
+	thisSequence->addSlot(objects::MGM_1_RM3100_HANDLER, length * 0,
+			DeviceHandlerIF::PERFORM_OPERATION);
+	thisSequence->addSlot(objects::MGM_1_RM3100_HANDLER, length * 0.2,
+			DeviceHandlerIF::SEND_WRITE);
+	thisSequence->addSlot(objects::MGM_1_RM3100_HANDLER, length * 0.4,
+			DeviceHandlerIF::GET_WRITE);
+	thisSequence->addSlot(objects::MGM_1_RM3100_HANDLER, length * 0.6,
+			DeviceHandlerIF::SEND_READ);
+	thisSequence->addSlot(objects::MGM_1_RM3100_HANDLER, length * 0.8,
+			DeviceHandlerIF::GET_READ);
+
+      thisSequence->addSlot(objects::MGM_2_LIS3_HANDLER, length * 0,
+              DeviceHandlerIF::PERFORM_OPERATION);
+      thisSequence->addSlot(objects::MGM_2_LIS3_HANDLER, length * 0.2,
+              DeviceHandlerIF::SEND_WRITE);
+      thisSequence->addSlot(objects::MGM_2_LIS3_HANDLER, length * 0.4,
+              DeviceHandlerIF::GET_WRITE);
+      thisSequence->addSlot(objects::MGM_2_LIS3_HANDLER, length * 0.6,
+              DeviceHandlerIF::SEND_READ);
+      thisSequence->addSlot(objects::MGM_2_LIS3_HANDLER, length * 0.8,
+              DeviceHandlerIF::GET_READ);
+
+	thisSequence->addSlot(objects::GYRO_1_L3G_HANDLER, length * 0,
+			DeviceHandlerIF::PERFORM_OPERATION);
+	thisSequence->addSlot(objects::GYRO_1_L3G_HANDLER, length * 0.2,
+			DeviceHandlerIF::SEND_WRITE);
+	thisSequence->addSlot(objects::GYRO_1_L3G_HANDLER, length * 0.4,
+			DeviceHandlerIF::GET_WRITE);
+	thisSequence->addSlot(objects::GYRO_1_L3G_HANDLER, length * 0.6,
+			DeviceHandlerIF::SEND_READ);
+	thisSequence->addSlot(objects::GYRO_1_L3G_HANDLER, length * 0.8,
+			DeviceHandlerIF::GET_READ);
+#endif
 
     if (thisSequence->checkSequence() != HasReturnvaluesIF::RETURN_OK) {
         sif::error << "Initialization of GomSpace PST failed" << std::endl;