diff --git a/bsp_q7s/ObjectFactory.cpp b/bsp_q7s/ObjectFactory.cpp
index 2c70e9c7..f17dadda 100644
--- a/bsp_q7s/ObjectFactory.cpp
+++ b/bsp_q7s/ObjectFactory.cpp
@@ -125,37 +125,37 @@ void ObjectFactory::produce(){
     new LinuxLibgpioIF(objects::GPIO_IF);
 #if TE0720 == 0
     /* Pin H2-11 on stack connector */
-    GpioConfig_t gpioConfigHeater0(std::string("gpiochip7"), 15,
+    GpioConfig_t gpioConfigHeater0(std::string("gpiochip7"), 16,
             std::string("Heater0"), gpio::OUT, 0);
     heaterGpiosCookie->addGpio(gpioIds::HEATER_0, gpioConfigHeater0);
 
     /* Pin H2-12 on stack connector */
-    GpioConfig_t gpioConfigHeater1(std::string("gpiochip7"), 11,
+    GpioConfig_t gpioConfigHeater1(std::string("gpiochip7"), 12,
             std::string("Heater1"), gpio::OUT, 0);
     heaterGpiosCookie->addGpio(gpioIds::HEATER_1, gpioConfigHeater1);
 
     /* Pin H2-13 on stack connector */
-    GpioConfig_t gpioConfigHeater2(std::string("gpiochip7"), 17,
+    GpioConfig_t gpioConfigHeater2(std::string("gpiochip7"), 7,
             std::string("Heater2"), gpio::OUT, 0);
     heaterGpiosCookie->addGpio(gpioIds::HEATER_2, gpioConfigHeater2);
 
-    GpioConfig_t gpioConfigHeater3(std::string("gpiochip7"), 13,
+    GpioConfig_t gpioConfigHeater3(std::string("gpiochip7"), 5,
             std::string("Heater3"), gpio::OUT, 0);
     heaterGpiosCookie->addGpio(gpioIds::HEATER_3, gpioConfigHeater3);
 
-    GpioConfig_t gpioConfigHeater4(std::string("gpiochip7"), 21,
+    GpioConfig_t gpioConfigHeater4(std::string("gpiochip7"), 3,
             std::string("Heater4"), gpio::OUT, 0);
     heaterGpiosCookie->addGpio(gpioIds::HEATER_4, gpioConfigHeater4);
 
-    GpioConfig_t gpioConfigHeater5(std::string("gpiochip7"), 23,
+    GpioConfig_t gpioConfigHeater5(std::string("gpiochip7"), 0,
             std::string("Heater5"), gpio::OUT, 0);
     heaterGpiosCookie->addGpio(gpioIds::HEATER_5, gpioConfigHeater5);
 
-    GpioConfig_t gpioConfigHeater6(std::string("gpiochip7"), 19,
+    GpioConfig_t gpioConfigHeater6(std::string("gpiochip7"), 1,
             std::string("Heater6"), gpio::OUT, 0);
     heaterGpiosCookie->addGpio(gpioIds::HEATER_6, gpioConfigHeater6);
 
-    GpioConfig_t gpioConfigHeater7(std::string("gpiochip7"), 10,
+    GpioConfig_t gpioConfigHeater7(std::string("gpiochip7"), 11,
             std::string("Heater7"), gpio::OUT, 0);
     heaterGpiosCookie->addGpio(gpioIds::HEATER_7, gpioConfigHeater7);
 
@@ -163,12 +163,12 @@ void ObjectFactory::produce(){
             pcduSwitches::TCS_BOARD_8V_HEATER_IN);
 
     GpioCookie* solarArrayDeplCookie = new GpioCookie;
-    GpioConfig_t gpioConfigDeplSA1(std::string("gpiochip7"), 22,
+    GpioConfig_t gpioConfigDeplSA0(std::string("gpiochip7"), 4,
                 std::string("DeplSA1"), gpio::OUT, 0);
-    solarArrayDeplCookie->addGpio(gpioIds::DEPLSA1, gpioConfigDeplSA1);
-    GpioConfig_t gpioConfigDeplSA2(std::string("gpiochip7"), 20,
+    solarArrayDeplCookie->addGpio(gpioIds::DEPLSA1, gpioConfigDeplSA0);
+    GpioConfig_t gpioConfigDeplSA1(std::string("gpiochip7"), 2,
                 std::string("DeplSA2"), gpio::OUT, 0);
-    solarArrayDeplCookie->addGpio(gpioIds::DEPLSA2, gpioConfigDeplSA2);
+    solarArrayDeplCookie->addGpio(gpioIds::DEPLSA2, gpioConfigDeplSA1);
 
     //TODO: Find out burn time. For now set to 1000 ms.
     new SolarArrayDeploymentHandler(objects::SOLAR_ARRAY_DEPL_HANDLER, objects::GPIO_IF,