diff --git a/src/main/java/stirling/software/SPDF/controller/api/pipeline/ApiDocService.java b/src/main/java/stirling/software/SPDF/controller/api/pipeline/ApiDocService.java
index 43448f89..3eda502b 100644
--- a/src/main/java/stirling/software/SPDF/controller/api/pipeline/ApiDocService.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/pipeline/ApiDocService.java
@@ -16,8 +16,11 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import jakarta.servlet.ServletContext;
+
+import stirling.software.SPDF.SPdfApplication;
 import stirling.software.SPDF.model.ApiEndpoint;
 import stirling.software.SPDF.model.Role;
+
 @Service
 public class ApiDocService {
 
@@ -28,11 +31,8 @@ public class ApiDocService {
 
     private String getApiDocsUrl() {
         String contextPath = servletContext.getContextPath();
-        String port = System.getProperty("local.server.port");
-        if(port == null || port.length() == 0) {
-        	port="8080";
-        }
-        
+        String port = SPdfApplication.getPort();
+
         return "http://localhost:"+ port + contextPath + "/v1/api-docs";
     }
     
diff --git a/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineProcessor.java b/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineProcessor.java
index 1ac7eef9..2fad339b 100644
--- a/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineProcessor.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineProcessor.java
@@ -34,6 +34,8 @@ import org.springframework.web.client.RestTemplate;
 import org.springframework.web.multipart.MultipartFile;
 
 import jakarta.servlet.ServletContext;
+
+import stirling.software.SPDF.SPdfApplication;
 import stirling.software.SPDF.model.PipelineConfig;
 import stirling.software.SPDF.model.PipelineOperation;
 import stirling.software.SPDF.model.Role;
@@ -65,7 +67,9 @@ public class PipelineProcessor {
 
 	private String getBaseUrl() {
 		String contextPath = servletContext.getContextPath();
-		return "http://localhost:8080" + contextPath + "/";
+		String port = SPdfApplication.getPort();
+
+		return "http://localhost:" + port + contextPath + "/";
 	}