diff --git a/meta-stonewither/conf/local.conf.sample b/meta-stonewither/conf/local.conf.sample
index 1153d85..04fed7a 100644
--- a/meta-stonewither/conf/local.conf.sample
+++ b/meta-stonewither/conf/local.conf.sample
@@ -1,5 +1,5 @@
 MACHINE ??= "stonewither"
-DISTRO ?= "openbmc-phosphor"
+DISTRO ?= "openbmc-witherspoon"
 PACKAGE_CLASSES ?= "package_rpm"
 SANITY_TESTED_DISTROS_append ?= " *"
 EXTRA_IMAGE_FEATURES = "debug-tweaks"
diff --git a/meta-witherspoon/conf/distro/openbmc-witherspoon.conf b/meta-witherspoon/conf/distro/openbmc-witherspoon.conf
new file mode 100644
index 0000000..27bf881
--- /dev/null
+++ b/meta-witherspoon/conf/distro/openbmc-witherspoon.conf
@@ -0,0 +1,2 @@
+require conf/distro/include/phosphor-base.inc
+require conf/distro/include/openpower-mrw.inc
diff --git a/meta-witherspoon/conf/local.conf.sample b/meta-witherspoon/conf/local.conf.sample
index 6e774ff..ca640ce 100644
--- a/meta-witherspoon/conf/local.conf.sample
+++ b/meta-witherspoon/conf/local.conf.sample
@@ -1,5 +1,5 @@
 MACHINE ??= "witherspoon"
-DISTRO ?= "openbmc-phosphor"
+DISTRO ?= "openbmc-witherspoon"
 PACKAGE_CLASSES ?= "package_rpm"
 SANITY_TESTED_DISTROS_append ?= " *"
 EXTRA_IMAGE_FEATURES = "debug-tweaks"
diff --git a/meta-witherspoon/conf/machine/witherspoon.conf b/meta-witherspoon/conf/machine/witherspoon.conf
index 806d534..0085a14 100644
--- a/meta-witherspoon/conf/machine/witherspoon.conf
+++ b/meta-witherspoon/conf/machine/witherspoon.conf
@@ -3,7 +3,7 @@
 
 UBOOT_MACHINE = "ast_g5_ncsi_config"
 
-OBMC_MACHINE_FEATURES += "obmc-mrw obmc-ubi-fs openpower-ubi-fs"
+OBMC_MACHINE_FEATURES += "obmc-ubi-fs openpower-ubi-fs"
 
 OBMC_POWER_SUPPLY_INSTANCES = "0 1"