diff --git a/src/modules/auth/auth.module.ts b/src/modules/auth/auth.module.ts
index 0aa9f21..78b160b 100644
--- a/src/modules/auth/auth.module.ts
+++ b/src/modules/auth/auth.module.ts
@@ -22,9 +22,9 @@ import { RefreshToken } from './entities/refresh-token.entity';
       useFactory: (configService: ConfigService) => ({
         global: true,
         secret: configService.getOrThrow<string>('JWT_SECRET'),
-        // signOptions: {
-        //   expiresIn: configService.getOrThrow<number>('JWT_EXPIRATION_TIME'),
-        // },
+        signOptions: {
+          expiresIn: configService.getOrThrow<number>('JWT_EXPIRATION_TIME'),
+        },
       }),
       inject: [ConfigService],
     }),
diff --git a/src/modules/auth/services/tokens.service.ts b/src/modules/auth/services/tokens.service.ts
index 0ffe9cc..606b8dc 100755
--- a/src/modules/auth/services/tokens.service.ts
+++ b/src/modules/auth/services/tokens.service.ts
@@ -20,7 +20,7 @@ export class TokensService {
 
   async generateAccessAndRefreshToken(ownerId: string, restaurantId: string, isAdmin: boolean) {
     const refreshExpire = this.configService.getOrThrow<number>('REFRESH_TOKEN_EXPIRE');
-    const accessExpire = this.configService.getOrThrow<number>('ACCESS_TOKEN_EXPIRE');
+    const accessExpire = this.configService.getOrThrow<number>('JWT_EXPIRATION_TIME');
 
     const payload: ITokenPayload | IAdminTokenPayload = isAdmin
       ? { adminId: ownerId, restId: restaurantId }
@@ -33,13 +33,13 @@ export class TokensService {
     await this.storeRefreshToken(ownerId, restaurantId, refreshToken, type);
 
     return {
-      accessToken: { token: accessToken, expire: dayjs().add(accessExpire, 'minutes').valueOf() },
+      accessToken: { token: accessToken, expire: dayjs().add(accessExpire, 'seconds').valueOf() },
       refreshToken: { token: refreshToken, expire: dayjs().add(refreshExpire, 'day').valueOf() },
     };
   }
 
-  private generateAccessToken(payload: ITokenPayload | IAdminTokenPayload, expire: number) {
-    return this.jwtService.signAsync(payload, { expiresIn: `${expire}m` });
+  private generateAccessToken(payload: ITokenPayload | IAdminTokenPayload, expiresIn: number) {
+    return this.jwtService.signAsync(payload, { expiresIn });
   }
 
   async storeRefreshToken(ownerId: string, restId: string, refreshToken: string, type: RefreshTokenType) {