diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 6ba40eb2..4f45aaa3 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -57,5 +57,6 @@ jobs:
             export SENTRY_DSN="${{ secrets.SENTRY_DSN }}"
             export GIT_CLIENT_ID="${{ secrets.GIT_CLIENT_ID }}"
             export GIT_CLIENT_SECRET="${{ secrets.GIT_CLIENT_SECRET }}"
+            export SANDBOX_URL="${{ secrets.SANDBOX_URL }}"
             cd ~/app
             bash deploy.sh
\ No newline at end of file
diff --git a/src/main/java/com/deepdirect/deepwebide_be/repository/service/RepositoryRunService.java b/src/main/java/com/deepdirect/deepwebide_be/repository/service/RepositoryRunService.java
index d551690b..268811fe 100644
--- a/src/main/java/com/deepdirect/deepwebide_be/repository/service/RepositoryRunService.java
+++ b/src/main/java/com/deepdirect/deepwebide_be/repository/service/RepositoryRunService.java
@@ -19,6 +19,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpMethod;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -47,9 +48,11 @@ public class RepositoryRunService {
     private final FileNodeRepository fileNodeRepository;
     private final FileContentRepository fileContentRepository;
     private final RunningContainerRepository runningContainerRepository;
-    private final String sandboxBaseUrl = "http://localhost:9090";
     private final RestTemplate restTemplate;
 
+    @Value("${sandbox.api.base-url}")
+    private String sandboxBaseUrl;
+
     @Transactional
     public RepositoryExecuteResponse executeRepository(Long repositoryId, Long userId) {
         log.info("Starting repository execution - repositoryId: {}, userId: {}", repositoryId, userId);
diff --git a/src/main/java/com/deepdirect/deepwebide_be/sandbox/controller/SandboxLogController.java b/src/main/java/com/deepdirect/deepwebide_be/sandbox/controller/SandboxLogController.java
index d9ff10fd..98c6521d 100644
--- a/src/main/java/com/deepdirect/deepwebide_be/sandbox/controller/SandboxLogController.java
+++ b/src/main/java/com/deepdirect/deepwebide_be/sandbox/controller/SandboxLogController.java
@@ -1,6 +1,7 @@
 package com.deepdirect.deepwebide_be.sandbox.controller;
 
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -16,10 +17,13 @@ public class SandboxLogController {
 
     private final RestTemplate restTemplate = new RestTemplate();
 
+    @Value("${sandbox.api.base-url}")
+    private String sandboxBaseUrl;
+
     @GetMapping("/logs/{uuid}")
     public ResponseEntity<String> getContainerLogs(@PathVariable String uuid) {
         String containerId = "sandbox-" + uuid;
-        String sandboxUrl = "http://localhost:9090/api/sandbox/logs/" + containerId;
+        String sandboxUrl = sandboxBaseUrl + "/api/sandbox/logs/" + containerId;
 
         try {
             ResponseEntity<String> response = restTemplate.getForEntity(sandboxUrl, String.class);
diff --git a/src/main/java/com/deepdirect/deepwebide_be/sandbox/service/SandboxService.java b/src/main/java/com/deepdirect/deepwebide_be/sandbox/service/SandboxService.java
index 6cd94052..86205e70 100644
--- a/src/main/java/com/deepdirect/deepwebide_be/sandbox/service/SandboxService.java
+++ b/src/main/java/com/deepdirect/deepwebide_be/sandbox/service/SandboxService.java
@@ -20,7 +20,7 @@ public class SandboxService {
 
     private final RestTemplate restTemplate;
 
-    @Value("${sandbox.api.base-url:http://localhost:9090}")
+    @Value("${sandbox.api.base-url}")
     private String sandboxBaseUrl;
 
     public SandboxExecutionResponse requestExecution(SandboxExecutionRequest request) {
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 53f438bc..ac018024 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -104,4 +104,8 @@ logging:
     io:
       sentry: INFO
     com:
-      deepdirect: DEBUG
\ No newline at end of file
+      deepdirect: DEBUG
+
+sandbox:
+  api:
+    base-url: ${SANDBOX_URL}
\ No newline at end of file