diff --git a/examples/utils/V1/enet_appboardutils_j721e_evm.c b/examples/utils/V1/enet_appboardutils_j721e_evm.c
index 387b467..97639dc 100644
--- a/examples/utils/V1/enet_appboardutils_j721e_evm.c
+++ b/examples/utils/V1/enet_appboardutils_j721e_evm.c
@@ -290,8 +290,13 @@ uint32_t EnetBoard_getPhyAddr(Enet_Type enetType,
             switch (portNum)
             {
                 case ENET_MAC_PORT_1:
+#if defined(ENETAPPUTILS_BYPASS_QSGMII)
+                    /* RGMII port, set correct PHY address */
+                    phyAddr = 0U;
+#else
                     /* QSGMII port */
                     phyAddr = 16U;
+#endif
                     break;
 
                 case ENET_MAC_PORT_2:
@@ -311,9 +316,13 @@ uint32_t EnetBoard_getPhyAddr(Enet_Type enetType,
                     break;
 
                 case ENET_MAC_PORT_4:
+#if defined(ENETAPPUTILS_BYPASS_QSGMII)
+                    /* RGMII port, set correct PHY address */
+                    phyAddr = 0U;
+#else
                     /* QSGMII port */
                     phyAddr = 19U;
-                    break;
+#endif
 
                 default:
                     EnetAppUtils_assert(false);
@@ -605,7 +614,7 @@ void EnetBoard_setPhyConfig(Enet_Type enetType,
         case ENET_CPSW_5G:
             /* Use RGMII port in GESI board when QSGMII is disabled */
 #if defined(ENETAPPUTILS_BYPASS_QSGMII)
-            if (ENET_MAC_PORT_2 == portNum)
+            if (ENET_MAC_PORT_1 == portNum || ENET_MAC_PORT_4 == portNum)
             {
                 EnetBoard_setPhyConfigRgmii(enetType,
                                                     portNum,