diff --git a/src/main/java/com/iconplus/smartproc/controller/AuthenticationController.java b/src/main/java/com/iconplus/smartproc/controller/AuthenticationController.java
index 7d63524..5ae9603 100644
--- a/src/main/java/com/iconplus/smartproc/controller/AuthenticationController.java
+++ b/src/main/java/com/iconplus/smartproc/controller/AuthenticationController.java
@@ -11,7 +11,7 @@ import com.iconplus.smartproc.model.response.RefreshTokenResponse;
 import com.iconplus.smartproc.service.authentication.*;
 import org.springframework.web.bind.annotation.*;
 
-@CrossOrigin(origins = "http://localhost:8080", allowCredentials = "true")
+@CrossOrigin(origins = "${fe.server}", allowCredentials = "true")
 @RestController
 @RequestMapping("/api/authentication")
 public class AuthenticationController {
diff --git a/src/main/java/com/iconplus/smartproc/controller/BidangController.java b/src/main/java/com/iconplus/smartproc/controller/BidangController.java
index 9090a81..286143f 100644
--- a/src/main/java/com/iconplus/smartproc/controller/BidangController.java
+++ b/src/main/java/com/iconplus/smartproc/controller/BidangController.java
@@ -9,7 +9,7 @@ import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.web.bind.annotation.*;
 
-@CrossOrigin(origins = "http://localhost:8080", allowCredentials = "true")
+@CrossOrigin(origins = "${fe.server}", allowCredentials = "true")
 @RestController
 @RequestMapping("/api/bidang")
 public class BidangController {
diff --git a/src/main/java/com/iconplus/smartproc/controller/InstansiController.java b/src/main/java/com/iconplus/smartproc/controller/InstansiController.java
index bd1455c..b094a85 100644
--- a/src/main/java/com/iconplus/smartproc/controller/InstansiController.java
+++ b/src/main/java/com/iconplus/smartproc/controller/InstansiController.java
@@ -9,7 +9,7 @@ import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.web.bind.annotation.*;
 
-@CrossOrigin(origins = "http://localhost:8080", allowCredentials = "true")
+@CrossOrigin(origins = "${fe.server}", allowCredentials = "true")
 @RestController
 @RequestMapping("/api/instansi")
 public class InstansiController {
diff --git a/src/main/java/com/iconplus/smartproc/controller/JabatanController.java b/src/main/java/com/iconplus/smartproc/controller/JabatanController.java
index 667f9e9..3a051ce 100644
--- a/src/main/java/com/iconplus/smartproc/controller/JabatanController.java
+++ b/src/main/java/com/iconplus/smartproc/controller/JabatanController.java
@@ -9,7 +9,7 @@ import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.web.bind.annotation.*;
 
-@CrossOrigin(origins = "http://localhost:8080", allowCredentials = "true")
+@CrossOrigin(origins = "${fe.server}", allowCredentials = "true")
 @RestController
 @RequestMapping("/api/jabatan")
 public class JabatanController {
diff --git a/src/main/java/com/iconplus/smartproc/controller/JenisAnggaranController.java b/src/main/java/com/iconplus/smartproc/controller/JenisAnggaranController.java
index cb61b31..82e34d0 100644
--- a/src/main/java/com/iconplus/smartproc/controller/JenisAnggaranController.java
+++ b/src/main/java/com/iconplus/smartproc/controller/JenisAnggaranController.java
@@ -10,7 +10,7 @@ import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.web.bind.annotation.*;
 
-@CrossOrigin(origins = "http://localhost:8080", allowCredentials = "true")
+@CrossOrigin(origins = "${fe.server}", allowCredentials = "true")
 @RestController
 @RequestMapping("/api/jenisanggaran")
 public class JenisAnggaranController {
diff --git a/src/main/java/com/iconplus/smartproc/controller/JenisKontrakController.java b/src/main/java/com/iconplus/smartproc/controller/JenisKontrakController.java
index d0d65c2..54e9637 100644
--- a/src/main/java/com/iconplus/smartproc/controller/JenisKontrakController.java
+++ b/src/main/java/com/iconplus/smartproc/controller/JenisKontrakController.java
@@ -10,7 +10,7 @@ import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.web.bind.annotation.*;
 
-@CrossOrigin(origins = "http://localhost:8080", allowCredentials = "true")
+@CrossOrigin(origins = "${fe.server}", allowCredentials = "true")
 @RestController
 @RequestMapping("/api/jeniskontrak")
 public class JenisKontrakController {
diff --git a/src/main/java/com/iconplus/smartproc/controller/JenisPengadaanController.java b/src/main/java/com/iconplus/smartproc/controller/JenisPengadaanController.java
index ed8559c..11454f7 100644
--- a/src/main/java/com/iconplus/smartproc/controller/JenisPengadaanController.java
+++ b/src/main/java/com/iconplus/smartproc/controller/JenisPengadaanController.java
@@ -9,7 +9,7 @@ import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.web.bind.annotation.*;
 
-@CrossOrigin(origins = "http://localhost:8080", allowCredentials = "true")
+@CrossOrigin(origins = "${fe.server}", allowCredentials = "true")
 @RestController
 @RequestMapping("/api/jenispengadaan")
 public class JenisPengadaanController {
diff --git a/src/main/java/com/iconplus/smartproc/controller/LokasiController.java b/src/main/java/com/iconplus/smartproc/controller/LokasiController.java
index 9579ced..2c8250b 100644
--- a/src/main/java/com/iconplus/smartproc/controller/LokasiController.java
+++ b/src/main/java/com/iconplus/smartproc/controller/LokasiController.java
@@ -10,7 +10,7 @@ import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.web.bind.annotation.*;
 
-@CrossOrigin(origins = "http://localhost:8080", allowCredentials = "true")
+@CrossOrigin(origins = "${fe.server}", allowCredentials = "true")
 @RestController
 @RequestMapping("/api/lokasi")
 public class LokasiController {
diff --git a/src/main/java/com/iconplus/smartproc/controller/MetodePengadaanController.java b/src/main/java/com/iconplus/smartproc/controller/MetodePengadaanController.java
index 8be516a..06bcf44 100644
--- a/src/main/java/com/iconplus/smartproc/controller/MetodePengadaanController.java
+++ b/src/main/java/com/iconplus/smartproc/controller/MetodePengadaanController.java
@@ -10,7 +10,7 @@ import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.web.bind.annotation.*;
 
-@CrossOrigin(origins = "http://localhost:8080", allowCredentials = "true")
+@CrossOrigin(origins = "${fe.server}", allowCredentials = "true")
 @RestController
 @RequestMapping("/api/metodepengadaan")
 public class MetodePengadaanController {
diff --git a/src/main/java/com/iconplus/smartproc/controller/MetodePenyampaianController.java b/src/main/java/com/iconplus/smartproc/controller/MetodePenyampaianController.java
index 0615825..3e1fe1f 100644
--- a/src/main/java/com/iconplus/smartproc/controller/MetodePenyampaianController.java
+++ b/src/main/java/com/iconplus/smartproc/controller/MetodePenyampaianController.java
@@ -12,7 +12,7 @@ import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.web.bind.annotation.*;
 
-@CrossOrigin(origins = "http://localhost:8080", allowCredentials = "true")
+@CrossOrigin(origins = "${fe.server}", allowCredentials = "true")
 @RestController
 @RequestMapping("/api/metodepenyampaian")
 public class MetodePenyampaianController {
diff --git a/src/main/java/com/iconplus/smartproc/controller/PermissionController.java b/src/main/java/com/iconplus/smartproc/controller/PermissionController.java
index caca5b5..9d7a536 100644
--- a/src/main/java/com/iconplus/smartproc/controller/PermissionController.java
+++ b/src/main/java/com/iconplus/smartproc/controller/PermissionController.java
@@ -6,7 +6,7 @@ import com.iconplus.smartproc.repository.PermissionRepository;
 import com.iconplus.smartproc.service.permission.PutUpdatePermissionService;
 import org.springframework.web.bind.annotation.*;
 
-@CrossOrigin(origins = "http://localhost:8080", allowCredentials = "true")
+@CrossOrigin(origins = "${fe.server}", allowCredentials = "true")
 @RestController
 @RequestMapping("/api/permission")
 public class PermissionController {
diff --git a/src/main/java/com/iconplus/smartproc/controller/RolesController.java b/src/main/java/com/iconplus/smartproc/controller/RolesController.java
index 13eafa2..0a4c4f5 100644
--- a/src/main/java/com/iconplus/smartproc/controller/RolesController.java
+++ b/src/main/java/com/iconplus/smartproc/controller/RolesController.java
@@ -9,7 +9,7 @@ import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.web.bind.annotation.*;
 
-@CrossOrigin(origins = "http://localhost:8080", allowCredentials = "true")
+@CrossOrigin(origins = "${fe.server}", allowCredentials = "true")
 @RestController
 @RequestMapping("/api/roles")
 public class RolesController {
diff --git a/src/main/java/com/iconplus/smartproc/controller/StrategiPengadaanController.java b/src/main/java/com/iconplus/smartproc/controller/StrategiPengadaanController.java
index 7575d5e..ce0e0bf 100644
--- a/src/main/java/com/iconplus/smartproc/controller/StrategiPengadaanController.java
+++ b/src/main/java/com/iconplus/smartproc/controller/StrategiPengadaanController.java
@@ -9,7 +9,7 @@ import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.web.bind.annotation.*;
 
-@CrossOrigin(origins = "http://localhost:8080", allowCredentials = "true")
+@CrossOrigin(origins = "${fe.server}", allowCredentials = "true")
 @RestController
 @RequestMapping("/api/strategipengadaan")
 public class StrategiPengadaanController {
diff --git a/src/main/java/com/iconplus/smartproc/controller/SumberDanaController.java b/src/main/java/com/iconplus/smartproc/controller/SumberDanaController.java
index 5670f07..0c1ccab 100644
--- a/src/main/java/com/iconplus/smartproc/controller/SumberDanaController.java
+++ b/src/main/java/com/iconplus/smartproc/controller/SumberDanaController.java
@@ -9,7 +9,7 @@ import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.web.bind.annotation.*;
 
-@CrossOrigin(origins = "http://localhost:8080", allowCredentials = "true")
+@CrossOrigin(origins = "${fe.server}", allowCredentials = "true")
 @RestController
 @RequestMapping("/api/sumberdana")
 public class SumberDanaController {
diff --git a/src/main/java/com/iconplus/smartproc/controller/SupplyPositioningMatrixController.java b/src/main/java/com/iconplus/smartproc/controller/SupplyPositioningMatrixController.java
index 79a3791..978a6df 100644
--- a/src/main/java/com/iconplus/smartproc/controller/SupplyPositioningMatrixController.java
+++ b/src/main/java/com/iconplus/smartproc/controller/SupplyPositioningMatrixController.java
@@ -12,7 +12,7 @@ import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.web.bind.annotation.*;
 
-@CrossOrigin(origins = "http://localhost:8080", allowCredentials = "true")
+@CrossOrigin(origins = "${fe.server}", allowCredentials = "true")
 @RestController
 @RequestMapping("/api/supplypositioningmatrix")
 public class SupplyPositioningMatrixController {
diff --git a/src/main/java/com/iconplus/smartproc/controller/UnitInisiatorController.java b/src/main/java/com/iconplus/smartproc/controller/UnitInisiatorController.java
index 74461ed..3e7213c 100644
--- a/src/main/java/com/iconplus/smartproc/controller/UnitInisiatorController.java
+++ b/src/main/java/com/iconplus/smartproc/controller/UnitInisiatorController.java
@@ -9,7 +9,7 @@ import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.web.bind.annotation.*;
 
-@CrossOrigin(origins = "http://localhost:8080", allowCredentials = "true")
+@CrossOrigin(origins = "${fe.server}", allowCredentials = "true")
 @RestController
 @RequestMapping("/api/unitinisiator")
 public class UnitInisiatorController {
diff --git a/src/main/java/com/iconplus/smartproc/controller/UsersController.java b/src/main/java/com/iconplus/smartproc/controller/UsersController.java
index adb8bf4..db2c09a 100644
--- a/src/main/java/com/iconplus/smartproc/controller/UsersController.java
+++ b/src/main/java/com/iconplus/smartproc/controller/UsersController.java
@@ -9,7 +9,7 @@ import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.web.bind.annotation.*;
 
-@CrossOrigin(origins = "http://localhost:8080", allowCredentials = "true")
+@CrossOrigin(origins = "${fe.server}", allowCredentials = "true")
 @RestController
 @RequestMapping("/api/users")
 public class UsersController {
diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml
index a7db672..70f8947 100644
--- a/src/main/resources/application-local.yml
+++ b/src/main/resources/application-local.yml
@@ -24,3 +24,6 @@ spring:
       ddl-auto: update
     database-platform: org.hibernate.dialect.PostgreSQLDialect
     show-sql: true
+
+fe:
+  server: http://localhost:8080
\ No newline at end of file