diff --git a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-net/first-boot-disable-ipmi-net.service b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-net/first-boot-disable-ipmi-net.service
new file mode 100644
index 0000000..92b8c3f
--- /dev/null
+++ b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-net/first-boot-disable-ipmi-net.service
@@ -0,0 +1,26 @@
+[Unit]
+Description=First Boot Disable IPMI Network
+After=phosphor-ipmi-net@eth0.service
+After=phosphor-ipmi-net@eth1.service
+After=phosphor-ipmi-net@eth0.socket
+After=phosphor-ipmi-net@eth1.socket
+Before=srvcfg-manager.service
+ConditionFileNotEmpty=!/var/lib/ipmi-net-disable-one-time
+
+[Service]
+ExecStart=/bin/systemctl stop phosphor-ipmi-net@eth0.socket
+ExecStart=/bin/systemctl disable phosphor-ipmi-net@eth0.socket
+ExecStart=/bin/systemctl stop phosphor-ipmi-net@eth0.service
+ExecStart=/bin/systemctl disable phosphor-ipmi-net@eth0.service
+ExecStart=/bin/systemctl stop phosphor-ipmi-net@eth1.socket
+ExecStart=/bin/systemctl disable phosphor-ipmi-net@eth1.socket
+ExecStart=/bin/systemctl stop phosphor-ipmi-net@eth1.service
+ExecStart=/bin/systemctl disable phosphor-ipmi-net@eth1.service
+ExecStart=/bin/systemctl --no-reload disable first-boot-disable-ipmi-net.service
+ExecStart=/bin/touch /var/lib/ipmi-net-disable-one-time
+SyslogIdentifier=first-boot-disable-ipmi-net
+Type=oneshot
+RemainAfterExit=Yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend
index 82705c4..7883432 100644
--- a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend
+++ b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend
@@ -9,3 +9,12 @@
     ${PN}@${ALT_RMCPP_IFACE}.service \
     ${PN}@${ALT_RMCPP_IFACE}.socket \
     "
+
+FILESEXTRAPATHS:prepend:p10bmc := "${THISDIR}/${PN}:"
+SRC_URI:append:p10bmc = " file://first-boot-disable-ipmi-net.service"
+SYSTEMD_SERVICE:${PN}:append:p10bmc = " first-boot-disable-ipmi-net.service"
+
+do_install:append:p10bmc() {
+    install -d ${D}${systemd_system_unitdir}
+    install -m 0644 ${WORKDIR}/first-boot-disable-ipmi-net.service ${D}${systemd_system_unitdir}/
+}