diff --git a/besu/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java b/besu/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java
index 2938088a40d..5483a6173d8 100644
--- a/besu/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java
+++ b/besu/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java
@@ -97,8 +97,9 @@ public static Collection<Object[]> parameters() {
                 new ForkId(Bytes.ofUnsignedInt(0xa3f5ab08L), 1561651L),
                 new ForkId(Bytes.ofUnsignedInt(0xc25efa5cL), 4460644L),
                 new ForkId(Bytes.ofUnsignedInt(0x757a1c47L), 5062605L),
-                new ForkId(Bytes.ofUnsignedInt(0xb8c6299dL), 0L),
-                new ForkId(Bytes.ofUnsignedInt(0xb8c6299dL), 0L))
+                new ForkId(Bytes.ofUnsignedInt(0xb8c6299dL), 1678832736L),
+                new ForkId(Bytes.ofUnsignedInt(0xf9843abfL), 0L),
+                new ForkId(Bytes.ofUnsignedInt(0xf9843abfL), 0L))
           },
           new Object[] {
             NetworkName.MAINNET,
diff --git a/config/src/main/resources/goerli.json b/config/src/main/resources/goerli.json
index 41283aa7d67..5ccc9e420ad 100644
--- a/config/src/main/resources/goerli.json
+++ b/config/src/main/resources/goerli.json
@@ -6,6 +6,7 @@
     "berlinBlock":4460644,
     "londonBlock":5062605,
     "terminalTotalDifficulty": 10790000,
+    "shanghaiTime": 1678832736,
     "clique":{
       "blockperiodseconds":15,
       "epochlength":30000
@@ -26,7 +27,7 @@
       "hash": "0x50e55c39a725f062af438c5332a5c5bec9a36d02c829ee6ac2cc27d1db719446",
       "number": 4350000,
       "totalDifficulty": "0x61DBBF",
-      "_comment": "must be the beginning of an epoch"
+      "_comment": "must be the beginning of a clique epoch"
     }
   },
   "coinbase":"0x0000000000000000000000000000000000000000",