diff --git a/meta-openpower/recipes-phosphor/network/first-boot-set-hostname/first-boot-set-hostname.service b/meta-openpower/recipes-phosphor/network/first-boot-set-hostname/first-boot-set-hostname.service
index ce59b33..45e73b5 100644
--- a/meta-openpower/recipes-phosphor/network/first-boot-set-hostname/first-boot-set-hostname.service
+++ b/meta-openpower/recipes-phosphor/network/first-boot-set-hostname/first-boot-set-hostname.service
@@ -2,6 +2,8 @@
 Description=Init BMC Hostname
 Wants=mapper-wait@-xyz-openbmc_project-inventory.service
 After=mapper-wait@-xyz-openbmc_project-inventory.service
+Wants=op-vpd-parser.service
+After=op-vpd-parser.service
 
 [Service]
 ExecStart=/usr/bin/first-boot-set-hostname.sh
diff --git a/meta-openpower/recipes-phosphor/network/first-boot-set-mac/first-boot-set-mac@.service b/meta-openpower/recipes-phosphor/network/first-boot-set-mac/first-boot-set-mac@.service
index a7c913e..8986efd 100644
--- a/meta-openpower/recipes-phosphor/network/first-boot-set-mac/first-boot-set-mac@.service
+++ b/meta-openpower/recipes-phosphor/network/first-boot-set-mac/first-boot-set-mac@.service
@@ -4,6 +4,8 @@
 After=mapper-wait@-xyz-openbmc_project-inventory.service
 Wants=mapper-wait@-xyz-openbmc_project-network-%i.service
 After=mapper-wait@-xyz-openbmc_project-network-%i.service
+Wants=op-vpd-parser.service
+After=op-vpd-parser.service
 
 [Service]
 ExecStart=/usr/bin/first-boot-set-mac.sh %i