diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 9ab70ba3a..888eb3626 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -60,11 +60,11 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
       - name: Build pd.i686
-        run: cmake -G"Unix Makefiles" -Bbuild . && cmake --build build -j
+        run: cmake -G"Unix Makefiles" -Bbuild -DCMAKE_C_FLAGS=-m32 -DCMAKE_CXX_FLAGS=-m32 . && cmake --build build -j
       - name: Build pd.pal.i686
-        run: cmake -G"Unix Makefiles" -Bbuild_pal -DROMID=pal-final . && cmake --build build_pal -j
+        run: cmake -G"Unix Makefiles" -Bbuild_pal -DCMAKE_C_FLAGS=-m32 -DCMAKE_CXX_FLAGS=-m32 -DROMID=pal-final . && cmake --build build_pal -j
       - name: Build pd.jpn.i686
-        run: cmake -G"Unix Makefiles" -Bbuild_jpn -DROMID=jpn-final . && cmake --build build_jpn -j
+        run: cmake -G"Unix Makefiles" -Bbuild_jpn -DCMAKE_C_FLAGS=-m32 -DCMAKE_CXX_FLAGS=-m32 -DROMID=jpn-final . && cmake --build build_jpn -j
       - name: Prepare artifact for packaging
         run: |
           mkdir -p bin/data
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9ac600dec..4aecdeef4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,6 +27,10 @@ option(FORCE_CROSSCOMPILE "Force cross compiling" NO)
 # Determine target arch
 
 target_architecture(TARGET_ARCH)
+if(TARGET_ARCH STREQUAL "i386")
+  # for historical reasons
+  set(TARGET_ARCH "i686")
+endif()
 
 # TODO
 set(TARGET_IS_BIG_ENDIAN FALSE)