diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index c86ffc0..7102294 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -5,13 +5,13 @@ spring.servlet.multipart.max-request-size=1000MB
 
 spring.servlet.multipart.enabled=true
 
-security.jwt.secret-key=PPp27xSTfBwOpRn4/AV6gPzQSnQg+Oi80KdWfCcuAHs=
+security.jwt.secret-key=${JWT_SECRET}
 security.jwt.expiration-time=3600000
 
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQLDialect
-spring.datasource.username=skycrateDB
-spring.datasource.password=loa_dngLLA8729
-spring.datasource.url=jdbc:mysql://192.168.29.36:3306/skycrate
+spring.datasource.username=${DB_USERNAME}
+spring.datasource.password=${DB_PASSWORD}
+spring.datasource.url=jdbc:mysql://${DB_URI}/${DB_NAME}
 
 spring.jpa.hibernate.ddl-auto=update
 spring.jpa.show-sql=true
@@ -23,15 +23,14 @@ server.port=8080
 
 server.ssl.enabled=true
 server.ssl.key-store=classpath:keystore.p12
-server.ssl.key-store-password=changeit
+server.ssl.key-store-password=${SSL_PASSWORD}
 server.ssl.key-store-type=PKCS12
-server.ssl.key-alias=mykey
+server.ssl.key-alias=skycrateSSL
 
 management.endpoints.web.exposure.include=*
 management.endpoint.health.show-details=always
 management.endpoints.enabled-by-default=true
 
-
 # Allow unauthenticated access
 #management.server.port=8080
 #management.server.ssl.enabled=false