diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 133527b..ce5dc58 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1 +1,15 @@
 spring.application.name=NoctuAuthenticator
+
+# Import additional properties from application.properties.env
+spring.config.import=classpath:application-env.properties
+
+# PostgreSQL configuration
+spring.datasource.url=${POSTGRES_URL}
+spring.datasource.username=${POSTGRES_USER}
+spring.datasource.password=${POSTGRES_PASSWORD}
+spring.datasource.driver-class-name=org.postgresql.Driver
+
+# Redis configuration
+spring.redis.host=${REDIS_HOST}
+spring.redis.port=${REDIS_PORT}
+#spring.redis.password=${REDIS_PASSWORD}