diff --git a/CloudController.cs b/CloudController.cs
index efef49a..920b768 100644
--- a/CloudController.cs
+++ b/CloudController.cs
@@ -79,8 +79,9 @@ public async Task<string> CreateNewRunner(string arch, string size, string runne
         //string imageName = $"gh-actions-img-{arch}-{imageVersion}";
         string imageName = profile.IsCustomImage ? $"ghri-{profile.OsImageName}-{arch}" : profile.OsImageName;
         
-        
-        string name = $"ghr-{NameGenerator.Identifiers.Get(separator: "-")}".ToLower();
+       
+        // The naming generator might produce names with whitespace.
+        string name = $"ghr-{NameGenerator.Identifiers.Get(separator: "-")}".ToLower().Replace(' ','-');
         
         _logger.LogInformation($"Creating VM {name} from image {imageName} of size {size} for {targetName}");