diff --git a/snippets/csharp/System.Security.Cryptography/SHA384/Overview/source.cs b/snippets/csharp/System.Security.Cryptography/SHA384/Overview/source.cs
index 636000ed0dd..cff9ced1224 100644
--- a/snippets/csharp/System.Security.Cryptography/SHA384/Overview/source.cs
+++ b/snippets/csharp/System.Security.Cryptography/SHA384/Overview/source.cs
@@ -12,8 +12,11 @@ protected void Method()
 // <Snippet1>
 byte[] data = new byte[DATA_SIZE];
 byte[] result;
-SHA384 shaM = new SHA384Managed();
-result = shaM.ComputeHash(data);
+
+using (SHA384 sha384 = SHA384.Create())
+{
+    result = sha384.ComputeHash(data);
+}
 // </Snippet1>
  }
 }
diff --git a/snippets/csharp/System.Security.Cryptography/SHA384Managed/Overview/source.cs b/snippets/csharp/System.Security.Cryptography/SHA384Managed/Overview/source.cs
index 43cb04973ce..38a0282371f 100644
--- a/snippets/csharp/System.Security.Cryptography/SHA384Managed/Overview/source.cs
+++ b/snippets/csharp/System.Security.Cryptography/SHA384Managed/Overview/source.cs
@@ -13,8 +13,10 @@ protected void Method()
 byte[] data = new byte[DATA_SIZE];
 byte[] result;
 
-SHA384 shaM = new SHA384Managed();
-result = shaM.ComputeHash(data);
+using (SHA384 shaM = new SHA384Managed())
+{
+    result = shaM.ComputeHash(data);
+}
 // </Snippet1>
  }
 }
diff --git a/snippets/csharp/System.Security.Cryptography/SHA512/Overview/source.cs b/snippets/csharp/System.Security.Cryptography/SHA512/Overview/source.cs
index 2d45d13082e..192164827c7 100644
--- a/snippets/csharp/System.Security.Cryptography/SHA512/Overview/source.cs
+++ b/snippets/csharp/System.Security.Cryptography/SHA512/Overview/source.cs
@@ -12,8 +12,11 @@ protected void Method()
 // <Snippet1>
 byte[] data = new byte[DATA_SIZE];
 byte[] result;
-SHA512 shaM = new SHA512Managed();
-result = shaM.ComputeHash(data);
+
+using (SHA512 sha512 = SHA512.Create())
+{
+    result = sha512.ComputeHash(data);
+}
 // </Snippet1>
  }
 }
diff --git a/snippets/csharp/System.Security.Cryptography/SHA512Managed/Overview/source.cs b/snippets/csharp/System.Security.Cryptography/SHA512Managed/Overview/source.cs
index 3377fcb40c7..5766c18b4f5 100644
--- a/snippets/csharp/System.Security.Cryptography/SHA512Managed/Overview/source.cs
+++ b/snippets/csharp/System.Security.Cryptography/SHA512Managed/Overview/source.cs
@@ -13,8 +13,10 @@ protected void Method()
 byte[] data = new byte[DATA_SIZE];
 byte[] result;
 
-SHA512 shaM = new SHA512Managed();
-result = shaM.ComputeHash(data);
+using (SHA512 shaM = new SHA512Managed())
+{
+    result = shaM.ComputeHash(data);
+}
 // </Snippet1>
  }
 }
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SHA384 Example/VB/source.vb b/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SHA384 Example/VB/source.vb
index d3a06bf9e1f..b06d3654da2 100644
--- a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SHA384 Example/VB/source.vb	
+++ b/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SHA384 Example/VB/source.vb	
@@ -2,15 +2,17 @@
 Imports System.ComponentModel
 Imports System.Security.Cryptography
 
-Public Class Sample
-    Protected DATA_SIZE As Integer = 1024
-    
-    Protected Sub Method()
+Public Module Sample
+    Private DATA_SIZE As Integer = 1024
+
+    Public Sub Main()
 ' <Snippet1>
- Dim data(DATA_SIZE) As Byte
- Dim result() As Byte
- Dim shaM As New SHA384Managed()
- result = shaM.ComputeHash(data)
+Dim data(DATA_SIZE) As Byte
+Dim result() As Byte
+
+Using sha384 As SHA384 = SHA384.Create()
+    result = sha384.ComputeHash(data)
+End Using
 ' </Snippet1>
     End Sub
-End Class
+End Module
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SHA384 Example/VB/vb.vbproj b/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SHA384 Example/VB/vb.vbproj
new file mode 100644
index 00000000000..7c3e6284580
--- /dev/null
+++ b/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SHA384 Example/VB/vb.vbproj	
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>vb</RootNamespace>
+    <TargetFramework>net6.0</TargetFramework>
+  </PropertyGroup>
+
+</Project>
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SHA384Managed Example/VB/source.vb b/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SHA384Managed Example/VB/source.vb
index f70ba058a32..7e39e8ed492 100644
--- a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SHA384Managed Example/VB/source.vb	
+++ b/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SHA384Managed Example/VB/source.vb	
@@ -2,16 +2,16 @@
 Imports System.ComponentModel
 Imports System.Security.Cryptography
 
-Public Class Sample
-    Protected DATA_SIZE As Integer = 1024
-    
-    Protected Sub Method()
+Public Module Sample
+    Private DATA_SIZE As Integer = 1024
+
+    Public Sub Main()
 ' <Snippet1>
- Dim data(DATA_SIZE) As Byte
- Dim result() As Byte
-        
- Dim shaM As New SHA384Managed()
- result = shaM.ComputeHash(data)
+Dim data(DATA_SIZE) As Byte
+Dim result() As Byte
+Using shaM As New SHA384Managed()
+    result = shaM.ComputeHash(data)
+End Using
 ' </Snippet1>
     End Sub
-End Class
+End Module
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SHA384Managed Example/VB/vb.vbproj b/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SHA384Managed Example/VB/vb.vbproj
new file mode 100644
index 00000000000..7c3e6284580
--- /dev/null
+++ b/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SHA384Managed Example/VB/vb.vbproj	
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>vb</RootNamespace>
+    <TargetFramework>net6.0</TargetFramework>
+  </PropertyGroup>
+
+</Project>
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SHA512 Example/VB/source.vb b/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SHA512 Example/VB/source.vb
index 6a5c71bab7a..7182b25d988 100644
--- a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SHA512 Example/VB/source.vb	
+++ b/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SHA512 Example/VB/source.vb	
@@ -2,15 +2,17 @@
 Imports System.ComponentModel
 Imports System.Security.Cryptography
 
-Public Class Sample
-    Protected DATA_SIZE As Integer = 1024
-    
-    Protected Sub Method()
+Public Module Sample
+    Private DATA_SIZE As Integer = 1024
+
+    Public Sub Main()
 ' <Snippet1>
- Dim data(DATA_SIZE) As Byte
- Dim result() As Byte
- Dim shaM As New SHA512Managed()
- result = shaM.ComputeHash(data)
+Dim data(DATA_SIZE) As Byte
+Dim result() As Byte
+
+Using sha512 As SHA512 = SHA512.Create()
+    result = sha512.ComputeHash(data)
+End Using
 ' </Snippet1>
     End Sub
-End Class
+End Module
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SHA512 Example/VB/vb.vbproj b/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SHA512 Example/VB/vb.vbproj
new file mode 100644
index 00000000000..7c3e6284580
--- /dev/null
+++ b/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SHA512 Example/VB/vb.vbproj	
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>vb</RootNamespace>
+    <TargetFramework>net6.0</TargetFramework>
+  </PropertyGroup>
+
+</Project>
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SHA512Managed Example/VB/source.vb b/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SHA512Managed Example/VB/source.vb
index 242dd480bd2..703526ed9cb 100644
--- a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SHA512Managed Example/VB/source.vb	
+++ b/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SHA512Managed Example/VB/source.vb	
@@ -2,16 +2,17 @@
 Imports System.ComponentModel
 Imports System.Security.Cryptography
 
-Public Class Sample
-    Protected DATA_SIZE As Integer = 1024
-    
-    Protected Sub Method()
+Public Module Sample
+    Private DATA_SIZE As Integer = 1024
+
+    Public Sub Main()
 ' <Snippet1>
- Dim data(DATA_SIZE) As Byte
- Dim result() As Byte
-        
- Dim shaM As New SHA512Managed()
- result = shaM.ComputeHash(data)
+Dim data(DATA_SIZE) As Byte
+Dim result() As Byte
+
+Using shaM As New SHA512Managed()
+    result = shaM.ComputeHash(data)
+End Using
 ' </Snippet1>
     End Sub
-End Class
+End Module
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SHA512Managed Example/VB/vb.vbproj b/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SHA512Managed Example/VB/vb.vbproj
new file mode 100644
index 00000000000..7c3e6284580
--- /dev/null
+++ b/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SHA512Managed Example/VB/vb.vbproj	
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>vb</RootNamespace>
+    <TargetFramework>net6.0</TargetFramework>
+  </PropertyGroup>
+
+</Project>