diff --git a/pom.xml b/pom.xml
index bdff812..6db0307 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,12 +121,6 @@
       <artifactId>spring-boot-starter-test</artifactId>
       <scope>test</scope>
     </dependency>
-
-    <dependency>
-      <groupId>io.springfox</groupId>
-      <artifactId>springfox-boot-starter</artifactId>
-      <version>3.0.0</version>
-    </dependency>
   </dependencies>
   
   <build>
diff --git a/src/main/java/xyz/subho/clone/twitter/TwitterBackendApplication.java b/src/main/java/xyz/subho/clone/twitter/TwitterBackendApplication.java
index 8e9573e..c49c3f9 100644
--- a/src/main/java/xyz/subho/clone/twitter/TwitterBackendApplication.java
+++ b/src/main/java/xyz/subho/clone/twitter/TwitterBackendApplication.java
@@ -20,10 +20,8 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 @SpringBootApplication
-@EnableSwagger2
 public class TwitterBackendApplication {
 
   public static void main(String[] args) {
diff --git a/src/main/java/xyz/subho/clone/twitter/config/ApplicationErrorController.java b/src/main/java/xyz/subho/clone/twitter/config/ApplicationErrorController.java
index 1998cf9..9a0c299 100644
--- a/src/main/java/xyz/subho/clone/twitter/config/ApplicationErrorController.java
+++ b/src/main/java/xyz/subho/clone/twitter/config/ApplicationErrorController.java
@@ -18,8 +18,8 @@
 
 package xyz.subho.clone.twitter.config;
 
-import java.util.Map;
 import jakarta.servlet.http.HttpServletRequest;
+import java.util.Map;
 import org.springframework.boot.autoconfigure.web.ServerProperties;
 import org.springframework.boot.autoconfigure.web.servlet.error.BasicErrorController;
 import org.springframework.boot.web.servlet.error.ErrorAttributes;
diff --git a/src/main/java/xyz/subho/clone/twitter/entity/HashtagPosts.java b/src/main/java/xyz/subho/clone/twitter/entity/HashtagPosts.java
index 39dfc93..6ffa08d 100644
--- a/src/main/java/xyz/subho/clone/twitter/entity/HashtagPosts.java
+++ b/src/main/java/xyz/subho/clone/twitter/entity/HashtagPosts.java
@@ -18,8 +18,6 @@
 
 package xyz.subho.clone.twitter.entity;
 
-import java.util.Date;
-import java.util.UUID;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
@@ -28,6 +26,8 @@
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
+import java.util.Date;
+import java.util.UUID;
 import lombok.Data;
 import org.hibernate.annotations.CreationTimestamp;
 import org.hibernate.annotations.UpdateTimestamp;
diff --git a/src/main/java/xyz/subho/clone/twitter/entity/Hashtags.java b/src/main/java/xyz/subho/clone/twitter/entity/Hashtags.java
index 121f936..8922e2a 100644
--- a/src/main/java/xyz/subho/clone/twitter/entity/Hashtags.java
+++ b/src/main/java/xyz/subho/clone/twitter/entity/Hashtags.java
@@ -19,10 +19,6 @@
 package xyz.subho.clone.twitter.entity;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -33,6 +29,10 @@
 import jakarta.persistence.Index;
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.Table;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
 import lombok.Data;
 import org.hibernate.annotations.CreationTimestamp;
 import org.hibernate.annotations.UpdateTimestamp;
diff --git a/src/main/java/xyz/subho/clone/twitter/entity/Likes.java b/src/main/java/xyz/subho/clone/twitter/entity/Likes.java
index 0eb0276..415c520 100644
--- a/src/main/java/xyz/subho/clone/twitter/entity/Likes.java
+++ b/src/main/java/xyz/subho/clone/twitter/entity/Likes.java
@@ -18,8 +18,6 @@
 
 package xyz.subho.clone.twitter.entity;
 
-import java.util.Date;
-import java.util.UUID;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
@@ -28,6 +26,8 @@
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
+import java.util.Date;
+import java.util.UUID;
 import lombok.Data;
 import org.hibernate.annotations.CreationTimestamp;
 import org.hibernate.annotations.UpdateTimestamp;
diff --git a/src/main/java/xyz/subho/clone/twitter/entity/Posts.java b/src/main/java/xyz/subho/clone/twitter/entity/Posts.java
index 1a6625e..228b92d 100644
--- a/src/main/java/xyz/subho/clone/twitter/entity/Posts.java
+++ b/src/main/java/xyz/subho/clone/twitter/entity/Posts.java
@@ -19,12 +19,6 @@
 package xyz.subho.clone.twitter.entity;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
 import jakarta.persistence.ElementCollection;
@@ -37,6 +31,12 @@
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.Table;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 import lombok.Data;
 import org.hibernate.annotations.CreationTimestamp;
 import org.hibernate.annotations.UpdateTimestamp;
diff --git a/src/main/java/xyz/subho/clone/twitter/entity/Users.java b/src/main/java/xyz/subho/clone/twitter/entity/Users.java
index f32365a..3dfdff2 100644
--- a/src/main/java/xyz/subho/clone/twitter/entity/Users.java
+++ b/src/main/java/xyz/subho/clone/twitter/entity/Users.java
@@ -19,12 +19,6 @@
 package xyz.subho.clone.twitter.entity;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
 import jakarta.persistence.ElementCollection;
@@ -36,6 +30,12 @@
 import jakarta.persistence.Index;
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.Table;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 import lombok.Data;
 import org.hibernate.annotations.CreationTimestamp;
 import org.hibernate.annotations.UpdateTimestamp;
diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties
index 6aa2e4c..c7e2e68 100644
--- a/src/main/resources/application-dev.properties
+++ b/src/main/resources/application-dev.properties
@@ -29,11 +29,11 @@
 # =====================================
 
 # Set here configurations for the database connection
-spring.datasource.url=jdbc:mysql://localhost:3306/twitter?createDatabaseIfNotExist=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Kolkata&useSSL=false
+spring.datasource.url=jdbc:mysql://${MYSQL_DB_HOST}:${MYSQL_DB_PORT}/twitter?createDatabaseIfNotExist=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Kolkata&useSSL=false
 
 # Username and secret
-spring.datasource.username=root
-spring.datasource.password=root
+spring.datasource.username=${MYSQL_DB_UNAME}
+spring.datasource.password=${MYSQL_DB_PASSWD}
 
 # Keep the connection alive if idle for a long time (needed in production)
 spring.datasource.testWhileIdle=true
diff --git a/src/test/java/xyz/subho/clone/twitter/TwitterBackendApplicationTests.java b/src/test/java/xyz/subho/clone/twitter/TwitterBackendApplicationTests.java
index 71f78f6..75275d7 100644
--- a/src/test/java/xyz/subho/clone/twitter/TwitterBackendApplicationTests.java
+++ b/src/test/java/xyz/subho/clone/twitter/TwitterBackendApplicationTests.java
@@ -25,7 +25,5 @@
 class DemoApplicationTests {
 
   @Test
-  void contextLoads() {
-  }
-
-}
\ No newline at end of file
+  void contextLoads() {}
+}