diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-O32/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-O32/buffers_defaults_t0.j2
index ea0a8b090593..b8c8dcc548f8 100644
--- a/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-O32/buffers_defaults_t0.j2
+++ b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-O32/buffers_defaults_t0.j2
@@ -12,10 +12,10 @@
     limitations under the License.
 #}
 {% set default_cable = '5m' %}
-{% set ingress_lossless_pool_size =  '48717824' %}
-{% set ingress_lossless_pool_xoff  =  '4628480' %}
+{% set ingress_lossless_pool_size =  '52879360' %}
+{% set ingress_lossless_pool_xoff  =  '2334720' %}
 {% set egress_lossless_pool_size =  '60817408' %}
-{% set egress_lossy_pool_size =  '48717824' %}
+{% set egress_lossy_pool_size =  '52879360' %}
 
 {% import 'buffers_defaults_objects.j2' as defs with context %}
 
diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-O32/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-O32/buffers_defaults_t1.j2
index bbde1ec35db6..3c82bfea348f 100644
--- a/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-O32/buffers_defaults_t1.j2
+++ b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-O32/buffers_defaults_t1.j2
@@ -12,10 +12,11 @@
     limitations under the License.
 #}
 {% set default_cable = '40m' %}
-{% set ingress_lossless_pool_size =  '44318720' %}
-{% set ingress_lossless_pool_xoff  =  '9027584' %}
+{% set ingress_lossless_pool_size =  '48750592' %}
+{% set ingress_lossless_pool_xoff  =  '6463488' %}
 {% set egress_lossless_pool_size =  '60817408' %}
-{% set egress_lossy_pool_size =  '44318720' %}
+{% set egress_lossy_pool_size =  '48750592' %}
+
 
 {% import 'buffers_defaults_objects.j2' as defs with context %}
 
diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V64/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V64/buffers_defaults_t0.j2
index 1648c465b51a..3b84f5611ad5 100644
--- a/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V64/buffers_defaults_t0.j2
+++ b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V64/buffers_defaults_t0.j2
@@ -15,15 +15,15 @@
 #}
 {% set default_cable = '5m' %}
 {%- if ((SYSTEM_DEFAULTS is defined) and ('tunnel_qos_remap' in SYSTEM_DEFAULTS) and (SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled')) -%}
-{% set ingress_lossless_pool_size =  '49577984' %}
-{% set ingress_lossless_pool_xoff  =  '3407872' %}
+{% set ingress_lossless_pool_size =  '49651712' %}
+{% set ingress_lossless_pool_xoff  =  '3375104' %}
 {% set egress_lossless_pool_size =  '60817408' %}
-{% set egress_lossy_pool_size =  '49577984' %}
+{% set egress_lossy_pool_size =  '49651712' %}
 {%- else -%}
-{% set ingress_lossless_pool_size =  '51036160' %}
-{% set ingress_lossless_pool_xoff  =  '2572288' %}
+{% set ingress_lossless_pool_size =  '51052544' %}
+{% set ingress_lossless_pool_xoff  =  '2555904' %}
 {% set egress_lossless_pool_size =  '60817408' %}
-{% set egress_lossy_pool_size =  '51036160' %}
+{% set egress_lossy_pool_size =  '51052544' %}
 {%- endif -%}
 
 {% import 'buffers_defaults_objects.j2' as defs with context %}
diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V64/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V64/buffers_defaults_t1.j2
index 161fefc5258c..15648f4ee148 100644
--- a/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V64/buffers_defaults_t1.j2
+++ b/device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V64/buffers_defaults_t1.j2
@@ -13,19 +13,22 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 #}
-{% set default_cable = '5m' %}
+
+{% set default_cable = '40m' %}
 {%- if ((SYSTEM_DEFAULTS is defined) and ('tunnel_qos_remap' in SYSTEM_DEFAULTS) and (SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled')) -%}
-{% set ingress_lossless_pool_size =  '38092800' %}
-{% set ingress_lossless_pool_xoff  =  '13647872' %}
+{% set ingress_lossless_pool_size =  '38273024' %}
+{% set ingress_lossless_pool_xoff  =  '13467648' %}
 {% set egress_lossless_pool_size =  '60817408' %}
-
+{% set egress_lossy_pool_size =  '38273024' %}
 {%- else -%}
-{% set ingress_lossless_pool_size =  '42467328' %}
-{% set ingress_lossless_pool_xoff  =  '11141120' %}
+{% set ingress_lossless_pool_size =  '42598400' %}
+{% set ingress_lossless_pool_xoff  =  '11010048' %}
 {% set egress_lossless_pool_size =  '60817408' %}
-{% set egress_lossy_pool_size =  '42467328' %}
+{% set egress_lossy_pool_size =  '42598400' %}
 {%- endif -%}
 
+
+
 {% import 'buffers_defaults_objects.j2' as defs with context %}
 
 {%- macro generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) %}