diff --git a/src/Microsoft.Tye.Core/DeployServiceYamlStep.cs b/src/Microsoft.Tye.Core/DeployServiceYamlStep.cs
index 5f65612c..38d23917 100644
--- a/src/Microsoft.Tye.Core/DeployServiceYamlStep.cs
+++ b/src/Microsoft.Tye.Core/DeployServiceYamlStep.cs
@@ -40,8 +40,8 @@ namespace Microsoft.Tye
             output.WriteDebugLine($"Writing output to '{tempFile.FilePath}'.");
 
             {
-                using var stream = File.OpenWrite(tempFile.FilePath);
-                using var writer = new StreamWriter(stream, Encoding.UTF8, bufferSize: -1, leaveOpen: true);
+                await using var stream = File.OpenWrite(tempFile.FilePath);
+                await using var writer = new StreamWriter(stream, Encoding.UTF8, bufferSize: -1, leaveOpen: true);
                 var yamlStream = new YamlStream(yaml.Select(y => y.Yaml));
                 yamlStream.Save(writer, assignAnchors: false);
             }
diff --git a/src/Microsoft.Tye.Core/DockerfileGenerator.cs b/src/Microsoft.Tye.Core/DockerfileGenerator.cs
index 17003a02..ce83e6f5 100644
--- a/src/Microsoft.Tye.Core/DockerfileGenerator.cs
+++ b/src/Microsoft.Tye.Core/DockerfileGenerator.cs
@@ -39,8 +39,8 @@ namespace Microsoft.Tye
                 throw new ArgumentNullException(nameof(filePath));
             }
 
-            using var stream = File.OpenWrite(filePath);
-            using var writer = new StreamWriter(stream, encoding: Encoding.UTF8, bufferSize: -1, leaveOpen: true);
+            await using var stream = File.OpenWrite(filePath);
+            await using var writer = new StreamWriter(stream, encoding: Encoding.UTF8, bufferSize: -1, leaveOpen: true);
 
             var entryPoint = Path.GetFileNameWithoutExtension(project.ProjectFile.Name);
             output.WriteDebugLine($"Writing Dockerfile to '{filePath}'.");
diff --git a/src/Microsoft.Tye.Core/ProcessUtil.cs b/src/Microsoft.Tye.Core/ProcessUtil.cs
index 675c99dc..15ee3d8c 100644
--- a/src/Microsoft.Tye.Core/ProcessUtil.cs
+++ b/src/Microsoft.Tye.Core/ProcessUtil.cs
@@ -109,7 +109,7 @@ namespace Microsoft.Tye
             process.BeginErrorReadLine();
 
             var cancelledTcs = new TaskCompletionSource<object?>();
-            using var _ = cancellationToken.Register(() => cancelledTcs.TrySetResult(null));
+            await using var _ = cancellationToken.Register(() => cancelledTcs.TrySetResult(null));
 
             var result = await Task.WhenAny(processLifetimeTask.Task, cancelledTcs.Task);
 
diff --git a/src/Microsoft.Tye.Core/ValidateSecretStep.cs b/src/Microsoft.Tye.Core/ValidateSecretStep.cs
index d558f6e3..0e5448a8 100644
--- a/src/Microsoft.Tye.Core/ValidateSecretStep.cs
+++ b/src/Microsoft.Tye.Core/ValidateSecretStep.cs
@@ -136,8 +136,8 @@ namespace Microsoft.Tye
             output.WriteDebugLine($"Writing output to '{tempFile.FilePath}'.");
 
             {
-                using var stream = File.OpenWrite(tempFile.FilePath);
-                using var writer = new StreamWriter(stream, Encoding.UTF8, bufferSize: -1, leaveOpen: true);
+                await using var stream = File.OpenWrite(tempFile.FilePath);
+                await using var writer = new StreamWriter(stream, Encoding.UTF8, bufferSize: -1, leaveOpen: true);
                 var yamlStream = new YamlStream(yaml.Select(y => y.Yaml));
                 yamlStream.Save(writer, assignAnchors: false);
             }
diff --git a/src/Microsoft.Tye.Hosting/Infrastructure/ProxyExtensions.cs b/src/Microsoft.Tye.Hosting/Infrastructure/ProxyExtensions.cs
index 448778cf..46a509d2 100644
--- a/src/Microsoft.Tye.Hosting/Infrastructure/ProxyExtensions.cs
+++ b/src/Microsoft.Tye.Hosting/Infrastructure/ProxyExtensions.cs
@@ -204,7 +204,7 @@ namespace Microsoft.AspNetCore.Proxy
             // SendAsync removes chunking from the response. This removes the header so it doesn't expect a chunked response.
             response.Headers.Remove("transfer-encoding");
 
-            using (var responseStream = await responseMessage.Content.ReadAsStreamAsync())
+            await using (var responseStream = await responseMessage.Content.ReadAsStreamAsync())
             {
                 await responseStream.CopyToAsync(response.Body, StreamCopyBufferSize, context.RequestAborted);
             }
diff --git a/src/tye/GenerateHost.cs b/src/tye/GenerateHost.cs
index 26922470..8c0cee46 100644
--- a/src/tye/GenerateHost.cs
+++ b/src/tye/GenerateHost.cs
@@ -50,8 +50,8 @@ namespace Microsoft.Tye
             {
                 File.Delete(outputFilePath);
 
-                using var stream = File.OpenWrite(outputFilePath);
-                using var writer = new StreamWriter(stream, Encoding.UTF8, leaveOpen: true);
+                await using var stream = File.OpenWrite(outputFilePath);
+                await using var writer = new StreamWriter(stream, Encoding.UTF8, leaveOpen: true);
 
                 await ApplicationYamlWriter.WriteAsync(output, writer, application);
             }
diff --git a/src/tye/Program.DeployCommand.cs b/src/tye/Program.DeployCommand.cs
index 3405f0fb..5e5b4236 100644
--- a/src/tye/Program.DeployCommand.cs
+++ b/src/tye/Program.DeployCommand.cs
@@ -94,8 +94,8 @@ namespace Microsoft.Tye
             output.WriteInfoLine($"Writing output to '{tempFile.FilePath}'.");
 
             {
-                using var stream = File.OpenWrite(tempFile.FilePath);
-                using var writer = new StreamWriter(stream, Encoding.UTF8, leaveOpen: true);
+                await using var stream = File.OpenWrite(tempFile.FilePath);
+                await using var writer = new StreamWriter(stream, Encoding.UTF8, leaveOpen: true);
 
                 await ApplicationYamlWriter.WriteAsync(output, writer, application);
             }