diff --git a/src/main/java/leonardo/labutilities/qualitylabpro/services/authentication/TokenService.java b/src/main/java/leonardo/labutilities/qualitylabpro/services/authentication/TokenService.java
index d529239..ceb1bfc 100644
--- a/src/main/java/leonardo/labutilities/qualitylabpro/services/authentication/TokenService.java
+++ b/src/main/java/leonardo/labutilities/qualitylabpro/services/authentication/TokenService.java
@@ -12,17 +12,16 @@
 import org.springframework.stereotype.Service;
 
 @Service
+@ConfigurationProperties(prefix = "api.security")
 public class TokenService {
-
-	@Value("${API_SECURITY_TOKEN_SECRET}")
-	private String SECRET;
-	@Value("${API_SECURITY_ISSUER}")
-	private String ISSUER;
+		
+	private String tokenSecret;
+	private String issuer;
 
 	public String generateToken(User user) {
 		try {
-			var algorithm = Algorithm.HMAC256(SECRET);
-			return JWT.create().withIssuer(ISSUER).withSubject(user.getEmail())
+			var algorithm = Algorithm.HMAC256(tokenSecret);
+			return JWT.create().withIssuer(issuer).withSubject(user.getEmail())
 					.withExpiresAt(dateExp()).sign(algorithm);
 		} catch (JWTCreationException exception) {
 			throw new RuntimeException("Error generating token", exception);
@@ -31,8 +30,8 @@ public String generateToken(User user) {
 
 	public String getSubject(String tokenJWT) {
 		try {
-			var algorithm = Algorithm.HMAC256(SECRET);
-			return JWT.require(algorithm).withIssuer(ISSUER).build().verify(tokenJWT).getSubject();
+			var algorithm = Algorithm.HMAC256(tokenSecret);
+			return JWT.require(algorithm).withIssuer(issuer).build().verify(tokenJWT).getSubject();
 		} catch (JWTVerificationException exception) {
 			throw new JWTVerificationException("Invalid token: " + exception.getMessage(),
 					exception);