diff --git a/modules/payloads/stagers/windows/bind_ipv6_tcp_uuid.rb b/modules/payloads/stagers/windows/bind_ipv6_tcp_uuid.rb
index 8401c8d861..b0a0907882 100644
--- a/modules/payloads/stagers/windows/bind_ipv6_tcp_uuid.rb
+++ b/modules/payloads/stagers/windows/bind_ipv6_tcp_uuid.rb
@@ -10,7 +10,7 @@ require 'msf/core/payload/windows/bind_tcp'
 
 module Metasploit4
 
-  CachedSize = 285
+  CachedSize = 318
 
   include Msf::Payload::Stager
   include Msf::Payload::Windows::BindTcp
diff --git a/modules/payloads/stagers/windows/x64/bind_ipv6_tcp.rb b/modules/payloads/stagers/windows/x64/bind_ipv6_tcp.rb
index 27ac40863d..3e2b01bdd6 100644
--- a/modules/payloads/stagers/windows/x64/bind_ipv6_tcp.rb
+++ b/modules/payloads/stagers/windows/x64/bind_ipv6_tcp.rb
@@ -9,7 +9,7 @@ require 'msf/core/payload/windows/x64/bind_tcp'
 
 module Metasploit4
 
-  CachedSize = 479
+  CachedSize = 483
 
   include Msf::Payload::Stager
   include Msf::Payload::Windows::BindTcp_x64
diff --git a/modules/payloads/stagers/windows/x64/bind_ipv6_tcp_uuid.rb b/modules/payloads/stagers/windows/x64/bind_ipv6_tcp_uuid.rb
index 25be549fe8..a23f337148 100644
--- a/modules/payloads/stagers/windows/x64/bind_ipv6_tcp_uuid.rb
+++ b/modules/payloads/stagers/windows/x64/bind_ipv6_tcp_uuid.rb
@@ -9,7 +9,7 @@ require 'msf/core/payload/windows/x64/bind_tcp'
 
 module Metasploit4
 
-  CachedSize = 479
+  CachedSize = 524
 
   include Msf::Payload::Stager
   include Msf::Payload::Windows::BindTcp_x64
diff --git a/modules/payloads/stagers/windows/x64/bind_tcp.rb b/modules/payloads/stagers/windows/x64/bind_tcp.rb
index b7dec4b64c..547e323d9f 100644
--- a/modules/payloads/stagers/windows/x64/bind_tcp.rb
+++ b/modules/payloads/stagers/windows/x64/bind_tcp.rb
@@ -9,7 +9,7 @@ require 'msf/core/payload/windows/x64/bind_tcp'
 
 module Metasploit4
 
-  CachedSize = 479
+  CachedSize = 481
 
   include Msf::Payload::Stager
   include Msf::Payload::Windows::BindTcp_x64
diff --git a/modules/payloads/stagers/windows/x64/bind_tcp_uuid.rb b/modules/payloads/stagers/windows/x64/bind_tcp_uuid.rb
index ee698c5933..ab3402808d 100644
--- a/modules/payloads/stagers/windows/x64/bind_tcp_uuid.rb
+++ b/modules/payloads/stagers/windows/x64/bind_tcp_uuid.rb
@@ -9,7 +9,7 @@ require 'msf/core/payload/windows/x64/bind_tcp'
 
 module Metasploit4
 
-  CachedSize = 520
+  CachedSize = 522
 
   include Msf::Payload::Stager
   include Msf::Payload::Windows::BindTcp_x64
diff --git a/spec/modules/payloads_spec.rb b/spec/modules/payloads_spec.rb
index 0348f2e3a4..998d3fccad 100644
--- a/spec/modules/payloads_spec.rb
+++ b/spec/modules/payloads_spec.rb
@@ -2642,6 +2642,17 @@ describe 'modules/payloads', :content do
                           reference_name: 'windows/meterpreter/bind_ipv6_tcp'
   end
 
+  context 'windows/meterpreter/bind_ipv6_tcp_uuid' do
+    it_should_behave_like 'payload cached size is consistent',
+                          ancestor_reference_names: [
+                              'stagers/windows/bind_ipv6_tcp_uuid',
+                              'stages/windows/meterpreter'
+                          ],
+                          dynamic_size: false,
+                          modules_pathname: modules_pathname,
+                          reference_name: 'windows/meterpreter/bind_ipv6_tcp_uuid'
+  end
+
   context 'windows/meterpreter/bind_nonx_tcp' do
     it_should_behave_like 'payload cached size is consistent',
                           ancestor_reference_names: [
@@ -3656,6 +3667,28 @@ describe 'modules/payloads', :content do
                           reference_name: 'windows/x64/loadlibrary'
   end
 
+  context 'windows/x64/meterpreter/bind_ipv6_tcp' do
+    it_should_behave_like 'payload cached size is consistent',
+                          ancestor_reference_names: [
+                              'stagers/windows/x64/bind_ipv6_tcp',
+                              'stages/windows/x64/meterpreter'
+                          ],
+                          dynamic_size: false,
+                          modules_pathname: modules_pathname,
+                          reference_name: 'windows/x64/meterpreter/bind_ipv6_tcp'
+  end
+
+  context 'windows/x64/meterpreter/bind_ipv6_tcp_uuid' do
+    it_should_behave_like 'payload cached size is consistent',
+                          ancestor_reference_names: [
+                              'stagers/windows/x64/bind_ipv6_tcp_uuid',
+                              'stages/windows/x64/meterpreter'
+                          ],
+                          dynamic_size: false,
+                          modules_pathname: modules_pathname,
+                          reference_name: 'windows/x64/meterpreter/bind_ipv6_tcp_uuid'
+  end
+
   context 'windows/x64/meterpreter/bind_tcp' do
     it_should_behave_like 'payload cached size is consistent',
                           ancestor_reference_names: [