diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9e234cae..d391877c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,9 +9,9 @@
 # ##############################################################################
 cmake_minimum_required(VERSION 3.13)
 
-set(OBSW_VERSION_MAJOR 4)
+set(OBSW_VERSION_MAJOR 5)
 set(OBSW_VERSION_MINOR 0)
-set(OBSW_VERSION_REVISION 1)
+set(OBSW_VERSION_REVISION 0)
 
 # set(CMAKE_VERBOSE TRUE)
 
diff --git a/bsp_q7s/core/CoreController.cpp b/bsp_q7s/core/CoreController.cpp
index f9242da3..9e285c4f 100644
--- a/bsp_q7s/core/CoreController.cpp
+++ b/bsp_q7s/core/CoreController.cpp
@@ -190,12 +190,14 @@ ReturnValue_t CoreController::initialize() {
     sif::warning << "Subscribing for GPS GPS_FIX_CHANGE event failed" << std::endl;
   }
 
-  UioMapper sysRomMapper(q7s::UIO_SYS_ROM);
-  result = sysRomMapper.getMappedAdress(&mappedSysRomAddr, UioMapper::Permissions::READ_ONLY);
-  if (result != returnvalue::OK) {
-    // TODO: This might be a reason to switch to another image..
-    sif::error << "Getting mapped SYS ROM UIO address failed" << std::endl;
-    return ObjectManager::CHILD_INIT_FAILED;
+  if (common::OBSW_VERSION_MAJOR >= 6 or common::OBSW_VERSION_MAJOR == 4) {
+    UioMapper sysRomMapper(q7s::UIO_SYS_ROM);
+    result = sysRomMapper.getMappedAdress(&mappedSysRomAddr, UioMapper::Permissions::READ_ONLY);
+    if (result != returnvalue::OK) {
+      // TODO: This might be a reason to switch to another image..
+      sif::error << "Getting mapped SYS ROM UIO address failed" << std::endl;
+      return ObjectManager::CHILD_INIT_FAILED;
+    }
   }
   return returnvalue::OK;
 }
@@ -2518,10 +2520,13 @@ void CoreController::announceVersionInfo() {
   }
 
   triggerEvent(VERSION_INFO, p1, p2);
-  if (mappedSysRomAddr != nullptr) {
-    uint32_t p1Firmware = *(reinterpret_cast<uint32_t *>(mappedSysRomAddr));
-    uint32_t p2Firmware = *(reinterpret_cast<uint32_t *>(mappedSysRomAddr) + 1);
-    triggerEvent(FIRMWARE_INFO, p1Firmware, p2Firmware);
+
+  if (common::OBSW_VERSION_MAJOR >= 6 or common::OBSW_VERSION_MAJOR == 4) {
+    if (mappedSysRomAddr != nullptr) {
+      uint32_t p1Firmware = *(reinterpret_cast<uint32_t *>(mappedSysRomAddr));
+      uint32_t p2Firmware = *(reinterpret_cast<uint32_t *>(mappedSysRomAddr) + 1);
+      triggerEvent(FIRMWARE_INFO, p1Firmware, p2Firmware);
+    }
   }
 }
 
diff --git a/bsp_q7s/core/ObjectFactory.cpp b/bsp_q7s/core/ObjectFactory.cpp
index 35d30c1a..8223ceaf 100644
--- a/bsp_q7s/core/ObjectFactory.cpp
+++ b/bsp_q7s/core/ObjectFactory.cpp
@@ -1017,16 +1017,18 @@ void ObjectFactory::createRadSensorChipSelect(LinuxLibgpioIF* gpioIF) {
 
 void ObjectFactory::createPlI2cResetGpio(LinuxLibgpioIF* gpioIF) {
   using namespace gpio;
-  if (gpioIF == nullptr) {
-    return;
+  if (common::OBSW_VERSION_MAJOR >= 6 or common::OBSW_VERSION_MAJOR == 4) {
+    if (gpioIF == nullptr) {
+      return;
+    }
+    GpioCookie* gpioI2cResetnCookie = new GpioCookie;
+    GpiodRegularByLineName* gpioI2cResetn = new GpiodRegularByLineName(
+        q7s::gpioNames::PL_I2C_ARESETN, "PL_I2C_ARESETN", Direction::OUT, Levels::HIGH);
+    gpioI2cResetnCookie->addGpio(gpioIds::PL_I2C_ARESETN, gpioI2cResetn);
+    gpioChecker(gpioIF->addGpios(gpioI2cResetnCookie), "PL I2C ARESETN");
+    // Reset I2C explicitely again.
+    gpioIF->pullLow(gpioIds::PL_I2C_ARESETN);
+    TaskFactory::delayTask(1);
+    gpioIF->pullHigh(gpioIds::PL_I2C_ARESETN);
   }
-  GpioCookie* gpioI2cResetnCookie = new GpioCookie;
-  GpiodRegularByLineName* gpioI2cResetn = new GpiodRegularByLineName(
-      q7s::gpioNames::PL_I2C_ARESETN, "PL_I2C_ARESETN", Direction::OUT, Levels::HIGH);
-  gpioI2cResetnCookie->addGpio(gpioIds::PL_I2C_ARESETN, gpioI2cResetn);
-  gpioChecker(gpioIF->addGpios(gpioI2cResetnCookie), "PL I2C ARESETN");
-  // Reset I2C explicitely again.
-  gpioIF->pullLow(gpioIds::PL_I2C_ARESETN);
-  TaskFactory::delayTask(1);
-  gpioIF->pullHigh(gpioIds::PL_I2C_ARESETN);
 }