diff --git a/builder/files/config.toml b/builder/files/config.toml
index cacdd9766f..9c17d11bf9 100644
--- a/builder/files/config.toml
+++ b/builder/files/config.toml
@@ -17,7 +17,6 @@ syncmode = "full"
 # snapshot = true
 # "bor.logs" = false
 # ethstats = ""
-# witnessprotocol = false
 # devfakeauthor = false
 # ["eth.requiredblocks"]
 
@@ -198,6 +197,9 @@ syncmode = "full"
   # procs = 8
   # enforce = false
 
+# [witness]
+#   enable = false
+
 # [pprof]
 #   pprof = false
 #   port = 6060
diff --git a/packaging/templates/mainnet-v1/sentry/sentry/bor/config.toml b/packaging/templates/mainnet-v1/sentry/sentry/bor/config.toml
index e7ed595b75..b756508be9 100644
--- a/packaging/templates/mainnet-v1/sentry/sentry/bor/config.toml
+++ b/packaging/templates/mainnet-v1/sentry/sentry/bor/config.toml
@@ -12,7 +12,6 @@ syncmode = "full"
 # gcmode = "full"
 # snapshot = true
 # ethstats = ""
-# witnessprotocol = false
 # devfakeauthor = false
 
 # ["eth.requiredblocks"]
@@ -189,6 +188,9 @@ syncmode = "full"
   # procs = 8
   # enforce = false
 
+# [witness]
+#   enable = false
+
 # [pprof]
 #   pprof = false
 #   port = 6060
diff --git a/packaging/templates/mainnet-v1/sentry/sentry/bor/pbss_config.toml b/packaging/templates/mainnet-v1/sentry/sentry/bor/pbss_config.toml
index 8cc250b3d2..d460fa6f1f 100644
--- a/packaging/templates/mainnet-v1/sentry/sentry/bor/pbss_config.toml
+++ b/packaging/templates/mainnet-v1/sentry/sentry/bor/pbss_config.toml
@@ -14,7 +14,6 @@ syncmode = "full"
 # gcmode = "full"
 # snapshot = true
 # ethstats = ""
-# witnessprotocol = false
 # devfakeauthor = false
 
 # ["eth.requiredblocks"]
@@ -191,6 +190,9 @@ syncmode = "full"
   # procs = 8
   # enforce = false
 
+# [witness]
+#   enable = false
+
 # [pprof]
 #   pprof = false
 #   port = 6060
diff --git a/packaging/templates/mainnet-v1/sentry/validator/bor/config.toml b/packaging/templates/mainnet-v1/sentry/validator/bor/config.toml
index fb6f868780..1c29481c07 100644
--- a/packaging/templates/mainnet-v1/sentry/validator/bor/config.toml
+++ b/packaging/templates/mainnet-v1/sentry/validator/bor/config.toml
@@ -14,7 +14,6 @@ syncmode = "full"
 # gcmode = "full"
 # snapshot = true
 # ethstats = ""
-# witnessprotocol = false
 # devfakeauthor = false
 
 # ["eth.requiredblocks"]
@@ -191,6 +190,9 @@ syncmode = "full"
   # procs = 8
   # enforce = false
 
+# [witness]
+#   enable = false
+
 # [pprof]
 #   pprof = false
 #   port = 6060
diff --git a/packaging/templates/mainnet-v1/sentry/validator/bor/pbss_config.toml b/packaging/templates/mainnet-v1/sentry/validator/bor/pbss_config.toml
index 3ee11b411a..d272ef46a2 100644
--- a/packaging/templates/mainnet-v1/sentry/validator/bor/pbss_config.toml
+++ b/packaging/templates/mainnet-v1/sentry/validator/bor/pbss_config.toml
@@ -16,7 +16,6 @@ syncmode = "full"
 # gcmode = "full"
 # snapshot = true
 # ethstats = ""
-# witnessprotocol = false
 # devfakeauthor = false
 
 # ["eth.requiredblocks"]
@@ -192,6 +191,9 @@ syncmode = "full"
   # procs = 8
   # enforce = false
 
+# [witness]
+#   enable = false
+
 # [pprof]
 #   pprof = false
 #   port = 6060
diff --git a/packaging/templates/mainnet-v1/without-sentry/bor/config.toml b/packaging/templates/mainnet-v1/without-sentry/bor/config.toml
index 3faffecc4d..126ba21722 100644
--- a/packaging/templates/mainnet-v1/without-sentry/bor/config.toml
+++ b/packaging/templates/mainnet-v1/without-sentry/bor/config.toml
@@ -14,7 +14,6 @@ syncmode = "full"
 # gcmode = "full"
 # snapshot = true
 # ethstats = ""
-# witnessprotocol = false
 # devfakeauthor = false
 
 # ["eth.requiredblocks"]
@@ -185,6 +184,9 @@ syncmode = "full"
   # procs = 8
   # enforce = false
 
+# [witness]
+#   enable = false
+
 # [pprof]
 #   pprof = false
 #   port = 6060
diff --git a/packaging/templates/mainnet-v1/without-sentry/bor/pbss_config.toml b/packaging/templates/mainnet-v1/without-sentry/bor/pbss_config.toml
index 8b9c4defe8..b1fdb219c1 100644
--- a/packaging/templates/mainnet-v1/without-sentry/bor/pbss_config.toml
+++ b/packaging/templates/mainnet-v1/without-sentry/bor/pbss_config.toml
@@ -15,7 +15,6 @@ syncmode = "full"
 # gcmode = "full"
 # snapshot = true
 # ethstats = ""
-# witnessprotocol = false
 # devfakeauthor = false
 
 # ["eth.requiredblocks"]
@@ -186,6 +185,9 @@ syncmode = "full"
   # procs = 8
   # enforce = false
 
+# [witness]
+#   enable = false
+
 # [pprof]
 #   pprof = false
 #   port = 6060
diff --git a/packaging/templates/testnet-amoy/sentry/sentry/bor/config.toml b/packaging/templates/testnet-amoy/sentry/sentry/bor/config.toml
index 6768e861c7..ca0a6a05eb 100644
--- a/packaging/templates/testnet-amoy/sentry/sentry/bor/config.toml
+++ b/packaging/templates/testnet-amoy/sentry/sentry/bor/config.toml
@@ -12,7 +12,6 @@ syncmode = "full"
 # gcmode = "full"
 # snapshot = true
 # ethstats = ""
-# witnessprotocol = false
 # devfakeauthor = false
 
 # ["eth.requiredblocks"]
@@ -188,6 +187,9 @@ syncmode = "full"
   # procs = 8
   # enforce = false
 
+# [witness]
+#   enable = false
+
 # [pprof]
 #   pprof = false
 #   port = 6060
diff --git a/packaging/templates/testnet-amoy/sentry/validator/bor/config.toml b/packaging/templates/testnet-amoy/sentry/validator/bor/config.toml
index 5cf9438b05..85002067df 100644
--- a/packaging/templates/testnet-amoy/sentry/validator/bor/config.toml
+++ b/packaging/templates/testnet-amoy/sentry/validator/bor/config.toml
@@ -14,7 +14,6 @@ syncmode = "full"
 # gcmode = "full"
 # snapshot = true
 # ethstats = ""
-# witnessprotocol = false
 # devfakeauthor = false
 
 # ["eth.requiredblocks"]
@@ -190,6 +189,9 @@ syncmode = "full"
   # procs = 8
   # enforce = false
 
+# [witness]
+#   enable = false
+
 #   pprof = false
 #   port = 6060
 #   addr = "127.0.0.1"
diff --git a/packaging/templates/testnet-amoy/without-sentry/bor/config.toml b/packaging/templates/testnet-amoy/without-sentry/bor/config.toml
index 833c4dc1b1..d5e5e40f19 100644
--- a/packaging/templates/testnet-amoy/without-sentry/bor/config.toml
+++ b/packaging/templates/testnet-amoy/without-sentry/bor/config.toml
@@ -14,7 +14,6 @@ syncmode = "full"
 # gcmode = "full"
 # snapshot = true
 # ethstats = ""
-# witnessprotocol = false
 # devfakeauthor = false
 
 # ["eth.requiredblocks"]
@@ -184,6 +183,9 @@ syncmode = "full"
   # procs = 8
   # enforce = false
 
+# [witness]
+#   enable = false
+
 # [pprof]
 #   pprof = false
 #   port = 6060