Index: ReserveNGo-backend/.gitignore
===================================================================
--- ReserveNGo-backend/.gitignore	(revision 647398c650ea9266179f1b46747cadd6bfb7f020)
+++ ReserveNGo-backend/.gitignore	(revision 479124f9e8d54c6981e2ceadcd914ac30c62f20d)
@@ -32,2 +32,4 @@
 ### VS Code ###
 .vscode/
+
+.env
Index: ReserveNGo-backend/pom.xml
===================================================================
--- ReserveNGo-backend/pom.xml	(revision 647398c650ea9266179f1b46747cadd6bfb7f020)
+++ ReserveNGo-backend/pom.xml	(revision 479124f9e8d54c6981e2ceadcd914ac30c62f20d)
@@ -102,4 +102,9 @@
             <version>2.0.2</version>
         </dependency>
+        <dependency>
+            <groupId>io.github.cdimascio</groupId>
+            <artifactId>dotenv-java</artifactId>
+            <version>3.2.0</version>
+        </dependency>
     </dependencies>
     <build>
Index: ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/ReserveNGoApplication.java
===================================================================
--- ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/ReserveNGoApplication.java	(revision 647398c650ea9266179f1b46747cadd6bfb7f020)
+++ ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/ReserveNGoApplication.java	(revision 479124f9e8d54c6981e2ceadcd914ac30c62f20d)
@@ -1,4 +1,5 @@
 package mk.ukim.finki.it.reservengo;
 
+import io.github.cdimascio.dotenv.Dotenv;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -11,4 +12,13 @@
 public class ReserveNGoApplication {
     public static void main(String[] args) {
+        Dotenv dotenv = Dotenv.configure()
+                .directory("./")
+                .ignoreIfMissing()
+                .load();
+
+        dotenv.entries().forEach(e ->
+                System.setProperty(e.getKey(), e.getValue())
+        );
+
         SpringApplication.run(ReserveNGoApplication.class, args);
     }
Index: ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/model/domain/User.java
===================================================================
--- ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/model/domain/User.java	(revision 647398c650ea9266179f1b46747cadd6bfb7f020)
+++ ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/model/domain/User.java	(revision 479124f9e8d54c6981e2ceadcd914ac30c62f20d)
@@ -69,4 +69,5 @@
         this.userRole = userRole;
         this.enabled = true;
+        this.provider = Provider.LOCAL;
         this.lastActivityDate = LocalDateTime.now();
     }
@@ -81,4 +82,5 @@
         this.provider = provider;
         this.providerId = providerId;
+        this.lastActivityDate = LocalDateTime.now();
     }
 
Index: ReserveNGo-backend/src/main/resources/application-dev.properties
===================================================================
--- ReserveNGo-backend/src/main/resources/application-dev.properties	(revision 647398c650ea9266179f1b46747cadd6bfb7f020)
+++ ReserveNGo-backend/src/main/resources/application-dev.properties	(revision 479124f9e8d54c6981e2ceadcd914ac30c62f20d)
@@ -1,6 +1,6 @@
 spring.datasource.url=jdbc:h2:mem:testdb
 
-spring.datasource.username=admin
-spring.datasource.password=admin
+spring.datasource.username=${H2_DB_USER}
+spring.datasource.password=${H2_DB_PASSWORD}
 
 spring.jpa.hibernate.ddl-auto=create-drop
@@ -8,8 +8,8 @@
 spring.h2.console.path=/h2
 
-spring.mail.host=smtp.gmail.com
-spring.mail.port=587
-spring.mail.username=reservengo2025@gmail.com
-spring.mail.password=nwix jxkk xzej yfmr
+spring.mail.host=${MAIL_HOST}
+spring.mail.port=${MAIL_PORT}
+spring.mail.username=${MAIL_USERNAME}
+spring.mail.password=${MAIL_PASSWORD}
 spring.mail.properties.mail.transport.protocol=smtp
 spring.mail.properties.mail.smtp.auth=true
@@ -17,4 +17,4 @@
 spring.mail.properties.mail.debug=true
 
-spring.security.oauth2.client.registration.google.client-id=427559721166-5nn0mbhfjnh28vijgg0hdrm2ad2sqr5h.apps.googleusercontent.com
-spring.security.oauth2.client.registration.google.client-secret=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
+spring.security.oauth2.client.registration.google.client-id=${CLIENT_ID}
+spring.security.oauth2.client.registration.google.client-secret=${CLIENT_SECRET}
Index: ReserveNGo-backend/src/main/resources/application-prod.properties
===================================================================
--- ReserveNGo-backend/src/main/resources/application-prod.properties	(revision 647398c650ea9266179f1b46747cadd6bfb7f020)
+++ ReserveNGo-backend/src/main/resources/application-prod.properties	(revision 479124f9e8d54c6981e2ceadcd914ac30c62f20d)
@@ -1,6 +1,6 @@
-spring.datasource.url=jdbc:postgresql://${DB_HOST:localhost}:${DB_PORT:5433}/resngo
+spring.datasource.url=jdbc:postgresql://${PG_DB_HOST}:${PG_DB_PORT}/resngo
 
-spring.datasource.username=${DB_USER:rng}
-spring.datasource.password=${DB_PASSWORD:rng}
+spring.datasource.username=${PG_DB_USER}
+spring.datasource.password=${PG_DB_PASSWORD}
 
 spring.jpa.hibernate.ddl-auto=create-drop
@@ -8,5 +8,5 @@
 
 spring.mail.host=${MAIL_HOST}
-spring.mail.port=587
+spring.mail.port=${MAIL_PORT}
 spring.mail.username=${MAIL_USERNAME}
 spring.mail.password=${MAIL_PASSWORD}