diff --git a/CHANGELOG.md b/CHANGELOG.md
index 46a8d51..e909739 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [1.5.15](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.14...v1.5.15) (2026-04-26)
+
+
+### Bug Fixes
+
+* merge customer and manager login ([#38](https://git.demonkernel.io.vn/FoodSurf/backend/issues/38)) ([e60c0b8](https://git.demonkernel.io.vn/FoodSurf/backend/commit/e60c0b89b924c913d1827ebdcfae536cd9e1cde9))
+
 ## [1.5.14](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.13...v1.5.14) (2026-04-26)
 
 
diff --git a/account-service/pom.xml b/account-service/pom.xml
index 4964dd2..f76a1eb 100644
--- a/account-service/pom.xml
+++ b/account-service/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.drinkool</groupId>
         <artifactId>drinkool</artifactId>
-        <version>1.5.14</version>
+        <version>1.5.15</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/eatery-service/pom.xml b/eatery-service/pom.xml
index fa0cdb7..de865fe 100644
--- a/eatery-service/pom.xml
+++ b/eatery-service/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.drinkool</groupId>
         <artifactId>drinkool</artifactId>
-        <version>1.5.14</version>
+        <version>1.5.15</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/gateway-service/pom.xml b/gateway-service/pom.xml
index f04c9f6..3ba3a0d 100644
--- a/gateway-service/pom.xml
+++ b/gateway-service/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.drinkool</groupId>
         <artifactId>drinkool</artifactId>
-        <version>1.5.14</version>
+        <version>1.5.15</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/gateway-service/src/main/java/com/drinkool/controller/ManagerController.java b/gateway-service/src/main/java/com/drinkool/controller/ManagerController.java
index 81ed01e..8b126f2 100644
--- a/gateway-service/src/main/java/com/drinkool/controller/ManagerController.java
+++ b/gateway-service/src/main/java/com/drinkool/controller/ManagerController.java
@@ -11,7 +11,7 @@ import java.util.*;
 import org.eclipse.microprofile.rest.client.inject.RestClient;
 
 @Path("/api/" + Role.Manager)
-public class ManagerController  {
+public class ManagerController {
 
 	@Inject
 	@RestClient
diff --git a/k8s/account.yaml b/k8s/account.yaml
index ba758c6..ebf9eba 100644
--- a/k8s/account.yaml
+++ b/k8s/account.yaml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
         - name: account-pod
-          image: git.demonkernel.io.vn/foodsurf/account-service:1.5.14
+          image: git.demonkernel.io.vn/foodsurf/account-service:1.5.15
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 8080
diff --git a/k8s/eatery.yaml b/k8s/eatery.yaml
index 9ced4f6..f48a2c6 100644
--- a/k8s/eatery.yaml
+++ b/k8s/eatery.yaml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
         - name: eatery-pod
-          image: git.demonkernel.io.vn/foodsurf/eatery-service:1.5.14
+          image: git.demonkernel.io.vn/foodsurf/eatery-service:1.5.15
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 8080
diff --git a/k8s/gateway.yaml b/k8s/gateway.yaml
index bf6c790..d5ab67c 100644
--- a/k8s/gateway.yaml
+++ b/k8s/gateway.yaml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
         - name: gateway-pod
-          image: git.demonkernel.io.vn/foodsurf/gateway-service:1.5.14
+          image: git.demonkernel.io.vn/foodsurf/gateway-service:1.5.15
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 8080
diff --git a/lib/pom.xml b/lib/pom.xml
index e47f729..c944af5 100644
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>com.drinkool</groupId>
     <artifactId>drinkool</artifactId>
-    <version>1.5.14</version>
+    <version>1.5.15</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/pom.xml b/pom.xml
index d023200..be08d26 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.drinkool</groupId>
   <artifactId>drinkool</artifactId>
-  <version>1.5.14</version>
+  <version>1.5.15</version>
   <packaging>pom</packaging>
   <properties>
     <maven.compiler.source>25</maven.compiler.source>