diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 3536fcb6..2cbe8797 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -9,7 +9,8 @@ env:
   REGISTRY: docker.frappet.com
   IMAGE_NAME: ehr/bma-ehr-admin
   DEPLOY_HOST: frappet.com
-  COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr-admin
+  COMPOSE_PATH: /home/frappet/docker/bma-ehr
+  # COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr-admin
 
 jobs:
   # act workflow_dispatch -W .github/workflows/release.yaml --input IMAGE_VER=test-v6.1 -s DOCKER_USER=sorawit -s DOCKER_PASS=P@ssword -s SSH_PASSWORD=P@ssw0rd
diff --git a/entrypoint.sh b/entrypoint.sh
index f6a7f419..371eaabd 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -4,7 +4,7 @@ ROOT_DIR=/app
 
 # Replace env vars in JavaScript files
 echo "Replacing env constants in JS"
-for file in $ROOT_DIR/assets/app.*.js* $ROOT_DIR/index.html $ROOT_DIR/assets/index*.js* $ROOT_DIR/assets/*.js*;
+for file in $ROOT_DIR/assets/app.*.js* $ROOT_DIR/js/app.*.js* $ROOT_DIR/assets/QSpace-*.js* $ROOT_DIR/index.html $ROOT_DIR/precache-manifest*.js $ROOT_DIR/assets/index*.js* $ROOT_DIR/assets/*.js*;
 do
   echo "Processing $file ...";
 
diff --git a/src/api/index.ts b/src/api/index.ts
index c81bbb7f..2667578e 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -11,11 +11,11 @@ export const apiUrlConfig = import.meta.env.VITE_API_URI_CONFIG
 
 const config = ref<any>({
 	development: {
-		API_URI: "https://bma-ehr.frappet.synology.me/api/v1",
-		API_URI_ORG_SERVICE: "https://bma-ehr.frappet.synology.me/api/v1", //ใช้ชั่วคราว
-		API_URI_ORG_EMPLOYEE_SERVICE: "https://bma-ehr.frappet.synology.me/api/v1", //ใช้ชั่วคราว
-		API_URI_PROFILE_SERVICE: "https://bma-ehr.frappet.synology.me/api/v1", //ใช้ชั่วคราว
-		API_REPORT_URI: "https://bma-ehr.frappet.synology.me/api/v1",
+		API_URI: apiUrlConfig,
+		API_URI_ORG_SERVICE: apiUrlConfig, //ใช้ชั่วคราว
+		API_URI_ORG_EMPLOYEE_SERVICE: apiUrlConfig, //ใช้ชั่วคราว
+		API_URI_PROFILE_SERVICE: apiUrlConfig,
+		API_REPORT_URI: apiUrlConfig,
 		MEET_URI: "meet.frappet.com",
 		API_REPORT2_URI: "https://bma-ehr.frappet.synology.me/api/v2",
 		API_REPORT_TEMPLATE_URI: "https://report-server.frappet.synology.me/api/v1/report-template",
@@ -35,7 +35,7 @@ const config = ref<any>({
 		API_REPORT_URI: apiUrlConfig,
 		MEET_URI: "meet.frappet.com",
 		API_REPORT2_URI: `${window.location.protocol}//${window.location.host}/api/v2`,
-		// API_REPORT_TEMPLATE_URI: apiUrlConfigReport,
+		API_REPORT_TEMPLATE_URI: "https://report-server.frappet.synology.me/api/v1/report-template",
 	},
 })