diff --git a/src/main/java/net/gepafin/tendermanagement/entities/UserEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/UserEntity.java
index 042fe962..719f9a5b 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/UserEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/UserEntity.java
@@ -12,7 +12,7 @@ import lombok.Setter;
 import java.time.LocalDateTime;
 
 @Entity
-@Table(name = "\"USER\"")
+@Table(name = "GEPAFIN_USER")
 @Getter
 @Setter
 public class UserEntity extends BaseEntity {
diff --git a/src/main/resources/db/changelog/db.changelog-1.0.0.xml b/src/main/resources/db/changelog/db.changelog-1.0.0.xml
index 20506096..5406e4a5 100644
--- a/src/main/resources/db/changelog/db.changelog-1.0.0.xml
+++ b/src/main/resources/db/changelog/db.changelog-1.0.0.xml
@@ -86,10 +86,10 @@
     </changeSet>
 
     <changeSet id="14-08-2024_3" author="Harish Bagora">
-        <createTable tableName="user">
+        <createTable tableName="gepafin_user">
             <column autoIncrement="true" name="id" type="INTEGER">
                 <constraints nullable="false" primaryKey="true"
-                             primaryKeyName="user_pkey"/>
+                             primaryKeyName="gepafin_user_pkey"/>
             </column>
             <column name="password" type="VARCHAR(255)">
                 <constraints nullable="false"/>
@@ -105,7 +105,7 @@
 			</column>
             <column name="phone_number" type="VARCHAR(255)"/>
             <column name="role_id" type="INTEGER">
-                <constraints nullable="false" foreignKeyName="fk_user_role" references="role(id)"/>
+                <constraints nullable="false" foreignKeyName="fk_gepafin_user_role" references="role(id)"/>
             </column>
             <column name="status" type="VARCHAR(255)">
 			<constraints nullable="false"/>