diff --git a/Kconfig b/Kconfig
index 7c19640..89f7467 100644
--- a/Kconfig
+++ b/Kconfig
@@ -43,6 +43,10 @@ config TARGET_SIMATIC_IPC227E
               bool "Siemens SIMATIC IPC227E"
               select ARCH_AMD64
+config TARGET_MCOM_X86
+             bool "Siemens M-COM X86"
+             select ARCH_AMD64
+
config TARGET_QEMU_ARM64
               bool "QEMU ARM64 (aarch64)"
               select ARCH_ARM64
@@ -73,6 +77,7 @@ config KAS_INCLUDE_BOARD
               string
               default "kas/board/qemu-amd64.yml" if TARGET_QEMU_AMD64
               default "kas/board/simatic-ipc227e.yml" if TARGET_SIMATIC_IPC227E
+             default "kas/board/mcom-x86.yml" if TARGET_MCOM_X86
               default "kas/board/qemu-arm64.yml" if TARGET_QEMU_ARM64
               default "kas/board/hihope-rzg2m.yml" if TARGET_HIHOPE_RZG2M
               default "kas/board/qemu-arm.yml" if TARGET_QEMU_ARM
@@ -190,7 +195,7 @@ if IMAGE_FLASH && !KERNEL_4_4 && !KERNEL_4_19
 config IMAGE_SWUPDATE
               bool "SWUpdate support for root partition"
-              depends on TARGET_QEMU_AMD64 || TARGET_SIMATIC_IPC227E || TARGET_QEMU_ARM64 || TARGET_QEMU_ARM || TARGET_BBB || ( TARGET_QEMU_RISCV64 && KERNEL_6_1 ) || TARGET_HIHOPE_RZG2M
+             depends on TARGET_QEMU_AMD64 || TARGET_SIMATIC_IPC227E || TARGET_MCOM_X86 ||TARGET_QEMU_ARM64 || TARGET_QEMU_ARM || TARGET_BBB || ( TARGET_QEMU_RISCV64 && KERNEL_6_1 ) || TARGET_HIHOPE_RZG2M
 config IMAGE_SECURE_BOOT
               bool "Secure boot support"
diff --git a/conf/machine/mcom-x86.conf b/conf/machine/mcom-x86.conf
new file mode 100644
index 0000000..21bcd1e
--- /dev/null
+++ b/conf/machine/mcom-x86.conf
@@ -0,0 +1,15 @@
+#
+# CIP Core, generic profile
+#
+# Copyright (c) Siemens Mobility GmbH, 2024
+#
+# SPDX-License-Identifier: MIT
+#
+
+DISTRO_ARCH = "amd64"
+
+IMAGE_FSTYPES ?= "wic"
+WKS_FILE ?= "x86_64-generic.wks"
+IMAGER_INSTALL:wic += "${GRUB_BOOTLOADER_INSTALL}"
+USE_CIP_KERNEL_CONFIG = "1"
+KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/x86/siemens_mcom_x86_defconfig"
diff --git a/kas/board/mcom-x86.yml b/kas/board/mcom-x86.yml
new file mode 100644
index 0000000..28c4674
--- /dev/null
+++ b/kas/board/mcom-x86.yml
@@ -0,0 +1,15 @@
+#
+# CIP Core, generic profile
+#
+# Copyright (c) Siemens Mobility GmbH, 2024
+#
+# Authors:
+#  Benjamin Schilling <schilling.benjamin@siemens.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+header:
+  version: 14
+
+machine: mcom-x86
diff --git a/recipes-kernel/linux/cip-kernel-config.inc b/recipes-kernel/linux/cip-kernel-config.inc
index 40c378b..7acdc0d 100644
--- a/recipes-kernel/linux/cip-kernel-config.inc
+++ b/recipes-kernel/linux/cip-kernel-config.inc
@@ -10,8 +10,8 @@
#
 SRC_URI:append = " ${@ \
-    'git://gitlab.com/cip-project/cip-kernel/cip-kernel-config.git;protocol=https;branch=master;destsuffix=cip-kernel-config;name=cip-kernel-config' \
+    'git://gitlab.com/benjamin-schilling/cip-kernel-config.git;protocol=https;branch=bs/mcom;destsuffix=cip-kernel-config;name=cip-kernel-config' \
     if d.getVar('USE_CIP_KERNEL_CONFIG') == '1' else '' \
     }"
-SRCREV_cip-kernel-config ?= "ee86aca8abbe7a41536bcb53142fbf0f57b1c9b7"
+SRCREV_cip-kernel-config ?= "50f7039f6c1486be2f1e1b2ca0ddc300895e44cd"
diff --git a/wic/mcom-x86-efibootguard.wks.in b/wic/mcom-x86-efibootguard.wks.in
new file mode 100644
index 0000000..6382ff7
--- /dev/null
+++ b/wic/mcom-x86-efibootguard.wks.in
@@ -0,0 +1,14 @@
+# short-description: x86 with EFI Boot Guard and SWUpdate
+# long-description: Disk image for x86 machines with EFI Boot Guard and SWUpdate
+
+include ebg-sysparts.inc
+
+part --source rawcopy --sourceparams "file=${IMAGE_FULLNAME}.squashfs" --align 1024 --fixed-size 1G --uuid "${ABROOTFS_PART_UUID_A}" --part-type 0FC63DAF-8483-4772-8E79-3D69D8477DE4
+part --source empty --align 1024 --fixed-size 1G --uuid "${ABROOTFS_PART_UUID_B}" --part-type 0FC63DAF-8483-4772-8E79-3D69D8477DE4
+
+# home and var are extra partitions
+
+part /home --source rootfs --change-directory=home --fstype=ext4 --label home --align 1024  --size 1G --extra-space=100M --fsuuid 1f55d66a-40d8-11ee-be56-0242ac120002
+part /var --fstype=ext4 --label var --align 1024 --fixed-size 2G --fsuuid 96be3374-4258-11ee-be56-0242ac120002
+
+bootloader --ptable gpt --append="console=tty0 console=ttyS0,115200 rootwait earlyprintk watchdog.handle_boot_enabled=0 iTCO_wdt.nowayout=1 "
