diff --git a/calico-enterprise_versioned_docs/version-3.22-2/variables.js b/calico-enterprise_versioned_docs/version-3.22-2/variables.js
index 2d1a0e05b1..b2c366dba4 100644
--- a/calico-enterprise_versioned_docs/version-3.22-2/variables.js
+++ b/calico-enterprise_versioned_docs/version-3.22-2/variables.js
@@ -19,7 +19,7 @@ const variables = {
   noderunning: 'calico-node',
   rootDirWindows: 'C:\\TigeraCalico',
   registry: 'quay.io/',
-  envoyVersion: '1.5.0',
+  envoyVersion: '1.7.2',
   chart_version_name: 'v3.22.6-0',
   tigeraOperator: releases[0]['tigera-operator'],
   dikastesVersion: releases[0].components.dikastes.version,
diff --git a/calico-enterprise_versioned_docs/version-3.23-2/variables.js b/calico-enterprise_versioned_docs/version-3.23-2/variables.js
index c720bb38d5..184147f891 100644
--- a/calico-enterprise_versioned_docs/version-3.23-2/variables.js
+++ b/calico-enterprise_versioned_docs/version-3.23-2/variables.js
@@ -21,7 +21,7 @@ const variables = {
   noderunning: 'calico-node',
   rootDirWindows: 'C:\\TigeraCalico',
   registry: 'quay.io/',
-  envoyVersion: '1.5.0',
+  envoyVersion: '1.8.0',
   chart_version_name: 'v3.23.1-0',
   tigeraOperator: releases[0]['tigera-operator'],
   dikastesVersion: releases[0].components.dikastes.version,
diff --git a/calico_versioned_docs/version-3.30/variables.js b/calico_versioned_docs/version-3.30/variables.js
index 857c3a2ad4..85bd6977e3 100644
--- a/calico_versioned_docs/version-3.30/variables.js
+++ b/calico_versioned_docs/version-3.30/variables.js
@@ -21,7 +21,7 @@ const variables = {
   releases,
   registry: '',
   vppbranch: 'v3.30.0',
-  envoyVersion: '1.3.2',
+  envoyVersion: '1.5.7',
   tigeraOperator: releases[0]['tigera-operator'],
   tigeraOperatorVersionShort: releases[0]['tigera-operator'].version.split('.').slice(0, 2).join('.'),
   imageNames: {
diff --git a/calico_versioned_docs/version-3.31/variables.js b/calico_versioned_docs/version-3.31/variables.js
index a14bf1d48b..6ef8812c10 100644
--- a/calico_versioned_docs/version-3.31/variables.js
+++ b/calico_versioned_docs/version-3.31/variables.js
@@ -20,7 +20,7 @@ const variables = {
   releases,
   registry: '',
   vppbranch: 'v3.31.0',
-  envoyVersion: '1.5.6',
+  envoyVersion: '1.8.0',
   tigeraOperator: releases[0]['tigera-operator'],
   tigeraOperatorVersionShort: releases[0]['tigera-operator'].version.split('.').slice(0, 2).join('.'),
   imageNames: {