diff --git a/config/osv/edge-microvisor-toolkit/emt3/imageconfigs/defaultconfigs/default-iso-x86_64.yml b/config/osv/edge-microvisor-toolkit/emt3/imageconfigs/defaultconfigs/default-iso-x86_64.yml
index 8a8134e6..76138c40 100644
--- a/config/osv/edge-microvisor-toolkit/emt3/imageconfigs/defaultconfigs/default-iso-x86_64.yml
+++ b/config/osv/edge-microvisor-toolkit/emt3/imageconfigs/defaultconfigs/default-iso-x86_64.yml
@@ -100,7 +100,6 @@ systemConfig: # Required
     - setools-console
 
     # intel-gpu-base
-    - kernel-drivers-gpu
     - linux-firmware-i915
     - linux-firmware-ice
     - intel-npu-firmware
@@ -115,11 +114,6 @@ systemConfig: # Required
     - dracut-virtio
     - dracut-xen
 
-    # docker
-    - moby-engine
-    - docker-cli
-    - docker-compose
-
     # intel-wireless
     - linux-firmware-iwlwifi
     - wireless-regdb
diff --git a/image-templates/additionalconfigs/configure-ip4save.sh b/image-templates/additionalconfigs/configure-ip4save.sh
new file mode 100644
index 00000000..414c442c
--- /dev/null
+++ b/image-templates/additionalconfigs/configure-ip4save.sh
@@ -0,0 +1 @@
+sed -i '/^COMMIT$/i -A INPUT -p icmp --icmp-type 8 -j ACCEPT' /etc/systemd/scripts/ip4save
diff --git a/image-templates/additionalconfigs/configure-systemd-networkd-client-identifier.sh b/image-templates/additionalconfigs/configure-systemd-networkd-client-identifier.sh
new file mode 100644
index 00000000..0cf18a37
--- /dev/null
+++ b/image-templates/additionalconfigs/configure-systemd-networkd-client-identifier.sh
@@ -0,0 +1 @@
+echo "ClientIdentifier=mac" >> /etc/systemd/network/99-dhcp-en.network
diff --git a/image-templates/emt3-x86_64-rt-kernel-docker-iso.yml b/image-templates/emt3-x86_64-rt-kernel-docker-iso.yml
new file mode 100644
index 00000000..9eb810b9
--- /dev/null
+++ b/image-templates/emt3-x86_64-rt-kernel-docker-iso.yml
@@ -0,0 +1,62 @@
+image:
+  name: emt3-x86_64-rt-kernel-docker
+  version: "1.0.0"
+
+target:
+  os: edge-microvisor-toolkit
+  dist: emt3
+  arch: x86_64
+  imageType: iso
+
+disk:
+  name: RT-Kernel-Docker
+  partitionTableType: gpt # Partition table type, valid value: [gpt, mbr]
+  partitions: # Required for raw, optional for ISO, not needed for rootfs.
+    - id: boot
+      type: esp
+      flags:
+        - esp
+        - boot
+      start: 1MiB
+      end: 9MiB
+      fsType: fat32
+      mountPoint: /boot/efi
+
+    - id: rootfs
+      type: linux-root-amd64
+      start: 9MiB
+      end: "0"  # 0 means use the rest of the disk space
+      fsType: ext4
+      mountPoint: /
+
+systemConfig:
+  name: RT-Kernel-Docker
+  description: RT kernel configuration with Docker
+
+  packages:
+    # developer-packages
+    - alsa-sof-firmware
+    # intel-gpu-base-rt
+    - kernel-rt-drivers-gpu
+    - intel-npu-driver
+    # kernel-rt-drivers
+    - kernel-rt-drivers-sound
+    # intel-rtd
+    - intel-cmt-cat
+    - intel-cmt-cat-devel
+    # docker
+    - moby-engine
+    - docker-cli
+    - docker-compose
+
+  kernel:
+    name: kernel-rt
+    cmdline: "console=ttyS0,115200n8 console=tty0 i915.force_probe=*"
+    packages:
+      - kernel-rt
+
+  additionalFiles:
+    - local: additionalconfigs/configure-systemd-networkd-client-identifier.sh
+      final: /tmp/configure-systemd-networkd-client-identifier.sh
+    - local: additionalconfigs/configure-ip4save.sh
+      final: /tmp/configure-ip4save.sh
diff --git a/image-templates/emt3-x86_64-rt-kernel-iso.yml b/image-templates/emt3-x86_64-rt-kernel-iso.yml
new file mode 100644
index 00000000..dc2b90ba
--- /dev/null
+++ b/image-templates/emt3-x86_64-rt-kernel-iso.yml
@@ -0,0 +1,58 @@
+image:
+  name: emt3-x86_64-rt-kernel
+  version: "1.0.0"
+
+target:
+  os: edge-microvisor-toolkit
+  dist: emt3
+  arch: x86_64
+  imageType: iso
+
+disk:
+  name: RT-Kernel
+  partitionTableType: gpt # Partition table type, valid value: [gpt, mbr]
+  partitions: # Required for raw, optional for ISO, not needed for rootfs.
+    - id: boot
+      type: esp
+      flags:
+        - esp
+        - boot
+      start: 1MiB
+      end: 9MiB
+      fsType: fat32
+      mountPoint: /boot/efi
+
+    - id: rootfs
+      type: linux-root-amd64
+      start: 9MiB
+      end: "0"  # 0 means use the rest of the disk space
+      fsType: ext4
+      mountPoint: /
+
+systemConfig:
+  name: RT-Kernel
+  description: RT kernel configuration
+
+  packages:
+    # developer-packages
+    - alsa-sof-firmware
+    # intel-gpu-base-rt
+    - kernel-rt-drivers-gpu
+    - intel-npu-driver
+    # kernel-rt-drivers
+    - kernel-rt-drivers-sound
+    # intel-rtd
+    - intel-cmt-cat
+    - intel-cmt-cat-devel
+
+  kernel:
+    name: kernel-rt
+    cmdline: "console=ttyS0,115200n8 console=tty0 i915.force_probe=*"
+    packages:
+      - kernel-rt
+
+  additionalFiles:
+    - local: additionalconfigs/configure-systemd-networkd-client-identifier.sh
+      final: /tmp/configure-systemd-networkd-client-identifier.sh
+    - local: additionalconfigs/configure-ip4save.sh
+      final: /tmp/configure-ip4save.sh
diff --git a/image-templates/emt3-x86_64-standard-kernel-docker-iso.yml b/image-templates/emt3-x86_64-standard-kernel-docker-iso.yml
new file mode 100644
index 00000000..c08856cc
--- /dev/null
+++ b/image-templates/emt3-x86_64-standard-kernel-docker-iso.yml
@@ -0,0 +1,59 @@
+image:
+  name: emt3-x86_64-standard-kernel-docker
+  version: "1.0.0"
+
+target:
+  os: edge-microvisor-toolkit
+  dist: emt3
+  arch: x86_64
+  imageType: iso
+
+disk:
+  name: Standard-Kernel-Docker
+  partitionTableType: gpt # Partition table type, valid value: [gpt, mbr]
+  partitions: # Required for raw, optional for ISO, not needed for rootfs.
+    - id: boot
+      type: esp
+      flags:
+        - esp
+        - boot
+      start: 1MiB
+      end: 9MiB
+      fsType: fat32
+      mountPoint: /boot/efi
+
+    - id: rootfs
+      type: linux-root-amd64
+      start: 9MiB
+      end: "0"  # 0 means use the rest of the disk space
+      fsType: ext4
+      mountPoint: /
+
+systemConfig:
+  name: Standard-Kernel-Docker
+  description: Standard kernel configuration with Docker
+
+  packages:
+    # developer-packages
+    - alsa-sof-firmware
+    # intel-gpu-base
+    - kernel-drivers-gpu
+    - intel-npu-driver
+    # kernel-drivers
+    - kernel-drivers-sound
+    # docker
+    - moby-engine
+    - docker-cli
+    - docker-compose
+
+  kernel:
+    name: kernel
+    cmdline: "console=ttyS0,115200n8 console=tty0 i915.force_probe=*"
+    packages:
+      - kernel
+
+  additionalFiles:
+    - local: additionalconfigs/configure-systemd-networkd-client-identifier.sh
+      final: /tmp/configure-systemd-networkd-client-identifier.sh
+    - local: additionalconfigs/configure-ip4save.sh
+      final: /tmp/configure-ip4save.sh
diff --git a/image-templates/emt3-x86_64-standard-kernel-iso.yml b/image-templates/emt3-x86_64-standard-kernel-iso.yml
new file mode 100644
index 00000000..14a724bd
--- /dev/null
+++ b/image-templates/emt3-x86_64-standard-kernel-iso.yml
@@ -0,0 +1,55 @@
+image:
+  name: emt3-x86_64-standard-kernel
+  version: "1.0.0"
+
+target:
+  os: edge-microvisor-toolkit
+  dist: emt3
+  arch: x86_64
+  imageType: iso
+
+disk:
+  name: Standard-Kernel
+  partitionTableType: gpt # Partition table type, valid value: [gpt, mbr]
+  partitions: # Required for raw, optional for ISO, not needed for rootfs.
+    - id: boot
+      type: esp
+      flags:
+        - esp
+        - boot
+      start: 1MiB
+      end: 9MiB
+      fsType: fat32
+      mountPoint: /boot/efi
+
+    - id: rootfs
+      type: linux-root-amd64
+      start: 9MiB
+      end: "0"  # 0 means use the rest of the disk space
+      fsType: ext4
+      mountPoint: /
+
+systemConfig:
+  name: Standard-Kernel
+  description: Standard kernel configuration
+
+  packages:
+    # developer-packages
+    - alsa-sof-firmware
+    # intel-gpu-base
+    - kernel-drivers-gpu
+    - intel-npu-driver
+    # kernel-drivers
+    - kernel-drivers-sound
+
+  kernel:
+    name: kernel
+    cmdline: "console=ttyS0,115200n8 console=tty0 i915.force_probe=*"
+    packages:
+      - kernel
+
+  additionalFiles:
+    - local: additionalconfigs/configure-systemd-networkd-client-identifier.sh
+      final: /tmp/configure-systemd-networkd-client-identifier.sh
+    - local: additionalconfigs/configure-ip4save.sh
+      final: /tmp/configure-ip4save.sh