diff --git a/classes/sota_am335x-nmhw21.bbclass b/classes/sota_am335x-nmhw21.bbclass
deleted file mode 100644
index 50d735b..0000000
--- a/classes/sota_am335x-nmhw21.bbclass
+++ /dev/null
@@ -1 +0,0 @@
-WKS_FILE_sota = "sdimage-sota-nmhw21.wks"
diff --git a/classes/sota_am335x.bbclass b/classes/sota_am335x.bbclass
new file mode 100644
index 0000000..b2821f2
--- /dev/null
+++ b/classes/sota_am335x.bbclass
@@ -0,0 +1 @@
+WKS_FILE_sota = "sdimage-sota-am335x.wks"
diff --git a/conf/machine/am335x-nmhw21.conf b/conf/machine/am335x-nmhw21.conf
index 686f27c..ba5935d 100644
--- a/conf/machine/am335x-nmhw21.conf
+++ b/conf/machine/am335x-nmhw21.conf
@@ -13,20 +13,7 @@ KERNEL_DEFCONFIG ??= "am335x-nmhw21_defconfig"
 KERNEL_DEVICETREE = "am335x-nmhw21-prod1.dtb \
     "
 
-SOTA_MACHINE = "${MACHINE}"
-
-KERNEL_CLASSES_append = " kernel-fitimage"
-
 KERNEL_IMAGETYPE = "zImage"
 KERNEL_IMAGETYPES = "fitImage zImage"
-KERNEL_IMAGETYPE_sota = "fitImage"
-KERNEL_IMAGETYPES_sota = "fitImage"
 
-INITRAMFS_IMAGE_BUNDLE_sota = "1"
-OSTREE_KERNEL = "${KERNEL_IMAGETYPE}-${INITRAMFS_IMAGE}-${MACHINE}-${MACHINE}"
-
-UBOOT_ENTRYPOINT ?= "0x80008000"
-IMAGE_BOOT_FILES = "MLO u-boot.img"
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-netmodule"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-am335x-nmhw21"
diff --git a/conf/machine/am335x-nrhw16.conf b/conf/machine/am335x-nrhw16.conf
index e3d37dc..aff5973 100644
--- a/conf/machine/am335x-nrhw16.conf
+++ b/conf/machine/am335x-nrhw16.conf
@@ -17,8 +17,6 @@ KERNEL_DEVICETREE = "am335x-nrhw16.dtb \
     am335x-nrhw16-prod5.dtb \
     "
 KERNEL_IMAGETYPE = "zImage"
+KERNEL_IMAGETYPES = "fitImage zImage"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-netmodule"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-am335x-nrhw16-v2"
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-netmodule"
diff --git a/conf/machine/am335x-nrhw20.conf b/conf/machine/am335x-nrhw20.conf
index c3fd8d5..3cccec4 100644
--- a/conf/machine/am335x-nrhw20.conf
+++ b/conf/machine/am335x-nrhw20.conf
@@ -13,17 +13,8 @@ KERNEL_DEFCONFIG ??= "am335x-nrhw20_defconfig"
 KERNEL_DEVICETREE = "am335x-nrhw20-prod1.dtb \
     "
 
-SOTA_MACHINE = "${MACHINE}"
-
-KERNEL_CLASSES_append = " kernel-fitimage"
-
 KERNEL_IMAGETYPE = "zImage"
 KERNEL_IMAGETYPES = "fitImage zImage"
-KERNEL_IMAGETYPE_sota = "fitImage"
-KERNEL_IMAGETYPES_sota = "fitImage"
-UBOOT_ENTRYPOINT ?= "0x80008000"
-IMAGE_BOOT_FILES = "MLO u-boot.img"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-netmodule"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-am335x-nrhw20-v1"
 
diff --git a/conf/machine/include/ti33x.inc b/conf/machine/include/ti33x.inc
index b91f4e6..2657ee4 100644
--- a/conf/machine/include/ti33x.inc
+++ b/conf/machine/include/ti33x.inc
@@ -31,6 +31,8 @@ UBOOT_MACHINE ?= "am335x_evm_config"
 
 UBOOT_ENTRYPOINT ?= "0x80008000"
 UBOOT_LOADADDRESS ?= "0x80008000"
+SOTA_MACHINE = "am335x"
+IMAGE_BOOT_FILES = "MLO u-boot.img"
 
 # Use the expected value of the ubifs filesystem's volume name in the kernel
 # and u-boot.
diff --git a/wic/sdimage-sota-nmhw21.wks b/wic/sdimage-sota-am335x.wks
similarity index 100%
rename from wic/sdimage-sota-nmhw21.wks
rename to wic/sdimage-sota-am335x.wks