diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml
index d3334e8f9..c79c4170f 100644
--- a/.github/workflows/workflow.yaml
+++ b/.github/workflows/workflow.yaml
@@ -128,6 +128,9 @@ jobs:
           pip3 install configobj
           pip3 install toml
           pip3 install fdt
+      - name: Copy config header
+        if: matrix.variant != 'default'
+        run: cp src/configs/obk_config_${{ matrix.variant }}.h src/obk_config.h
       - run: ls -la
       - name: Run make
         run: make APP_VERSION=${{ needs.refs.outputs.version }}${{ matrix.variant != 'default' && '_' || '' }}${{ matrix.variant != 'default' && matrix.variant || '' }} APP_NAME=${{ matrix.platform }} VARIANT=${{ matrix.variant }} ${{ matrix.platform }}
diff --git a/Makefile b/Makefile
index 0b114b07a..f417c1494 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,6 @@
 # HACK - if COMPILE_PREX defined then we are being called running from original build_app.sh script in standard SDK
 # Required to not break old build_app.sh script lines 74-77
 MBEDTLS=output/mbedtls-2.28.5
-CCFLAGS += -DVARIANT=$(VARIANT)
-
 ifdef COMPILE_PREX
 all:
 	@echo Calling original build_app.sh script
diff --git a/src/configs/obk_config_berry.h b/src/configs/obk_config_berry.h
new file mode 100644
index 000000000..e69de29bb