diff --git a/modules/openapi-generator-core/src/main/java/org/openapitools/codegen/config/WorkflowSettings.java b/modules/openapi-generator-core/src/main/java/org/openapitools/codegen/config/WorkflowSettings.java
index 352481025a10..322ef82f3536 100644
--- a/modules/openapi-generator-core/src/main/java/org/openapitools/codegen/config/WorkflowSettings.java
+++ b/modules/openapi-generator-core/src/main/java/org/openapitools/codegen/config/WorkflowSettings.java
@@ -21,6 +21,7 @@
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
+import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
@@ -292,7 +293,7 @@ public Builder withInputSpec(String inputSpec) {
          * @return a reference to this Builder
          */
         public Builder withOutputDir(String outputDir) {
-            this.outputDir = outputDir;
+            this.outputDir = Paths.get(outputDir).toAbsolutePath().toString();;
             return this;
         }
 
@@ -402,7 +403,7 @@ public Builder withTemplateDir(String templateDir) {
                             "Template directory " + templateDir + " does not exist.");
                 }
 
-                this.templateDir = f.getAbsolutePath();
+                this.templateDir =  Paths.get(f.toURI()).toAbsolutePath().toString();
             }
 
             return this;
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/CodegenConfigurator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/CodegenConfigurator.java
index 65857f180c02..086482679954 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/CodegenConfigurator.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/CodegenConfigurator.java
@@ -427,13 +427,14 @@ public ClientOptInput toClientOptInput() {
 
         CodegenConfig config = CodegenConfigLoader.forName(generatorName);
 
-        if (isNotEmpty(config.getLibrary())) {
-            config.setLibrary(config.getLibrary());
-        }
 
         WorkflowSettings workflowSettings = context.getWorkflowSettings();
         GeneratorSettings generatorSettings = context.getGeneratorSettings();
 
+        if (isNotEmpty(generatorSettings.getLibrary())) {
+            config.setLibrary(generatorSettings.getLibrary());
+        }
+
         // TODO: Work toward CodegenConfig having a "WorkflowSettings" property, or better a "Workflow" object which itself has a "WorkflowSettings" property.
         config.setInputSpec(workflowSettings.getInputSpec());
         config.setOutputDir(workflowSettings.getOutputDir());