diff --git a/NodeApp/src/commander/exercise/subcommands/ExerciseCreateCommand.ts b/NodeApp/src/commander/exercise/subcommands/ExerciseCreateCommand.ts
index 8a0d7ea5aa83a020396d9aa09019c3c6f30552c1..4b6c953953dcca41dae6176ee53093976f571df7 100644
--- a/NodeApp/src/commander/exercise/subcommands/ExerciseCreateCommand.ts
+++ b/NodeApp/src/commander/exercise/subcommands/ExerciseCreateCommand.ts
@@ -87,7 +87,7 @@ class ExerciseCreateCommand extends CommanderCommand {
         if ( options.clone ) {
             console.log(TextStyle.BLOCK('Please wait while we are cloning the repository...'));
 
-            await GitlabManager.cloneRepository(options.clone, this.exercise.gitlabCreationInfo.ssh_url_to_repo, `DojoExercise - ${ this.exercise.assignmentName }`, true, 0);
+            await GitlabManager.cloneRepository(options.clone, this.exercise.gitlabCreationInfo.ssh_url_to_repo, `DojoExercise_${ this.exercise.assignmentName }`, true, 0);
         }
     }
 
diff --git a/NodeApp/src/managers/GitlabManager.ts b/NodeApp/src/managers/GitlabManager.ts
index 9291be49dced0d043b285bd14824eecd5bb0f702..dc5f0edd07e28552dfaa771baa7588687af4e3ca 100644
--- a/NodeApp/src/managers/GitlabManager.ts
+++ b/NodeApp/src/managers/GitlabManager.ts
@@ -191,7 +191,7 @@ class GitlabManager extends SharedGitlabManager {
 
         try {
             await new Promise<void>((resolve, reject) => {
-                const gitClone = spawn(`git clone ${ repositorySshUrl } "${ folderName ?? '' }"`, {
+                const gitClone = spawn(`git clone ${ repositorySshUrl } "${ folderName?.replace(' ', '_') ?? '' }"`, {
                     cwd  : path,
                     shell: true
                 });