diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4abbf7bc..15980fb6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,10 +19,6 @@ list yields a list of all related PRs for each release.
 
 ## Changed
 
-- Split up `bsp_q7s` in separate EM and FM build with module loading set to different
-  default values. The EM object factory is unique which allows building a parallel setup
-  with dummy components
-- All major BSPs have an own `OBSWConfig.h.in` file which simplifies the file significantly
 - PCDU handler only called once in PST, but can handle multiple messages now
 - Update rootfs base of Linux, all related OBSW changes
 - Use gpsd version 3.17 now. Includes API changes
@@ -30,6 +26,22 @@ list yields a list of all related PRs for each release.
 - Rename GPS device to `/dev/gps0`
 - Add Syrlinks and TMP devices to Software by default
 
+### EM and FM splitup & Build Workflow improvements
+
+- Split up `bsp_q7s` in separate EM and FM build with module loading set to different
+  default values. The EM object factory is unique which allows building a parallel setup
+  with dummy components
+- All major BSPs have an own `OBSWConfig.h.in` file which simplifies the file significantly
+- Renamed Q7S primary build folders:
+  - `cmake-build-debug-q7s` for primary development build
+  - `cmake-build-release-q7s` for primary release build
+  - `cmake-build-debug-q7s-em` for primary development build of the EM software
+  - `cmake-build-release-q7s-em` for primary release build of the EM software
+- Refactored Q7S helper script handling. It is now intended and preferred to copy the environment
+  script to the same folder level as the `eive-obsw` and source it. This will also
+  add the path containing the shell helper scripts to `PATH`
+- The actual helper shell scripts were renamed as well to `q7s-<buildSystem>-<buildType>.sh`
+
 # [v1.10.1]
 
 Version bump