diff --git a/pom.xml b/pom.xml
index 1e0e8fb..9a77219 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,12 +29,12 @@
         <!-- HTTP Client -->
         <apache-http.version>5.3.1</apache-http.version>
 
-        <!-- Security & Authentication -->
-        <java-jwt.version>4.4.0</java-jwt.version>
-
         <!-- Utilities -->
         <commons-lang3.version>3.18.0</commons-lang3.version>
 
+        <!-- JWT Processing -->
+        <jjwt.version>0.13.0</jjwt.version>
+
         <!-- Logging - Updated to fix security vulnerability -->
         <log4j-api.version>2.25.3</log4j-api.version>
         <log4j-core.version>2.25.3</log4j-core.version>
@@ -255,14 +255,30 @@
         </dependency>
 
         <!-- ====================================== -->
-        <!-- Security & Authentication              -->
+        <!-- JWT Processing                         -->
         <!-- ====================================== -->
 
-        <!-- Auth0 Java JWT - Token Handling -->
+        <!-- JJWT API - JWT Processing Interface -->
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-api</artifactId>
+            <version>${jjwt.version}</version>
+        </dependency>
+
+        <!-- JJWT Implementation - JWT Processing -->
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-impl</artifactId>
+            <version>${jjwt.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <!-- JJWT Jackson - JSON Processing for JWT -->
         <dependency>
-            <groupId>com.auth0</groupId>
-            <artifactId>java-jwt</artifactId>
-            <version>${java-jwt.version}</version>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-jackson</artifactId>
+            <version>${jjwt.version}</version>
+            <scope>runtime</scope>
         </dependency>
 
         <!-- ====================================== -->
diff --git a/src/main/java/apiCalls/Utils/generic/BaseAPI.java b/src/main/java/apiCalls/Utils/generic/BaseAPI.java
index 812c644..dda640e 100644
--- a/src/main/java/apiCalls/Utils/generic/BaseAPI.java
+++ b/src/main/java/apiCalls/Utils/generic/BaseAPI.java
@@ -4,8 +4,7 @@
 import activesupport.system.Properties;
 import apiCalls.Utils.http.RestUtils;
 import apiCalls.actions.Token;
-import com.auth0.jwt.JWT;
-import com.auth0.jwt.exceptions.JWTDecodeException;
+import io.jsonwebtoken.Jwts;
 import org.apache.hc.core5.http.HttpException;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -44,9 +43,14 @@ public synchronized String adminJWT() throws HttpException {
 
     private boolean isTokenExpired(String token) {
         try {
-            var decodedJWT = JWT.decode(token);
-            return decodedJWT.getExpiresAt().before(new Date());
-        } catch (JWTDecodeException e) {
+            var decodedJWT = Jwts.parser()
+                    .unsecured()
+                    .build()
+                    .parseUnsecuredClaims(token)
+                    .getPayload();
+            
+            return decodedJWT.getExpiration().before(new Date());
+        } catch (Exception e) {
             LOGGER.error("Error decoding token: {}", e.getMessage());
             return true;
         }