diff --git a/src/vm/plugins/database.plugin.ts b/src/vm/plugins/database.plugin.ts
index 43b4fbc..3ae8585 100644
--- a/src/vm/plugins/database.plugin.ts
+++ b/src/vm/plugins/database.plugin.ts
@@ -14,6 +14,23 @@ export class DatabasePlugin extends Plugin {
     super(name, ["query"]);
   }
 
+  private static async isConnected(key: string): Promise<boolean> {
+    try {
+      const pool = DatabasePlugin.connectionPool.get(key);
+      if (!pool) {
+        return false;
+      }
+
+      const connection = await pool.getConnection();
+      await connection.ping();
+      connection.release();
+
+      return true;
+    } catch {
+      return false;
+    }
+  }
+
   static async init(
     name: string,
     config: {
@@ -28,18 +45,19 @@ export class DatabasePlugin extends Plugin {
   ): Promise<DatabasePlugin> {
     const connectionKey = `${config.host}:${config.port}:${config.user}:${config.database}`;
 
-    if (DatabasePlugin.connectionPool.has(connectionKey)) {
-      const existingConnection =
-        DatabasePlugin.connectionPool.get(connectionKey);
-
-      if (!(await existingConnection.ping())) {
-        DatabasePlugin.connectionPool.delete(connectionKey);
-      } else {
-        return new DatabasePlugin(name, existingConnection);
-      }
+    if (await DatabasePlugin.isConnected(connectionKey)) {
+      return new DatabasePlugin(
+        name,
+        await DatabasePlugin.connectionPool.get(connectionKey).getConnection()
+      );
     }
 
-    const dbConnection = await mysql.createConnection({
+    if (DatabasePlugin.connectionPool.has(connectionKey)) {
+      await DatabasePlugin.connectionPool.get(connectionKey).end();
+      DatabasePlugin.connectionPool.delete(connectionKey);
+    }
+
+    const poolConnections = mysql.createPool({
       host: config.host,
       user: config.user,
       port: config.port,
@@ -52,8 +70,8 @@ export class DatabasePlugin extends Plugin {
       connectionLimit: 15,
     });
 
-    DatabasePlugin.connectionPool.set(connectionKey, dbConnection);
-    return new DatabasePlugin(name, dbConnection);
+    DatabasePlugin.connectionPool.set(connectionKey, poolConnections);
+    return new DatabasePlugin(name, await poolConnections.getConnection());
   }
 
   async query(query): Promise<any> {
@@ -61,6 +79,9 @@ export class DatabasePlugin extends Plugin {
   }
 
   onFinish() {
-    this.dbConnection.end();
+    const pool = this.dbConnection?.pool;
+    if (pool && typeof pool.releaseConnection === "function") {
+      pool.releaseConnection(this.dbConnection);
+    }
   }
 }
diff --git a/src/vm/plugins/redis.plugin.ts b/src/vm/plugins/redis.plugin.ts
index 48ca81c..021613a 100644
--- a/src/vm/plugins/redis.plugin.ts
+++ b/src/vm/plugins/redis.plugin.ts
@@ -2,6 +2,8 @@ import Redis from "ioredis";
 import { Plugin } from "../plugin.class";
 
 export class RedisPlugin extends Plugin {
+  private static connectionPool: Map<string, Redis> = new Map();
+
   constructor(
     name: string,
     private redisClient: Redis,
@@ -22,16 +24,37 @@ export class RedisPlugin extends Plugin {
     ]);
   }
 
+  private static isConnected(key: string): boolean {
+    return (
+      RedisPlugin.connectionPool.has(key) &&
+      RedisPlugin.connectionPool.get(key).status === "ready"
+    );
+  }
+
   static init(
     name: string,
     config: { host: string; port: number },
     prefix: string
   ): RedisPlugin {
+    const key = `${config.host}:${config.port}`;
+
+    if (RedisPlugin.isConnected(key)) {
+      return new RedisPlugin(name, RedisPlugin.connectionPool.get(key), prefix);
+    }
+
+    RedisPlugin.connectionPool.delete(key);
+
     const redisClient = new Redis({
       host: config.host,
       port: config.port,
+      commandTimeout: 10000,
+      connectTimeout: 10000,
+      lazyConnect: false,
+      maxRetriesPerRequest: 1,
+      enableReadyCheck: true,
     });
 
+    RedisPlugin.connectionPool.set(key, redisClient);
     return new RedisPlugin(name, redisClient, prefix);
   }
 
diff --git a/src/vm/vm.class.ts b/src/vm/vm.class.ts
index 9db77bd..fd7feed 100644
--- a/src/vm/vm.class.ts
+++ b/src/vm/vm.class.ts
@@ -130,8 +130,6 @@ export class Vm {
     });
 
     this.setFunction("log", (...args) => {
-      console.log(...args);
-
       const logType = args.find(
         (arg) =>
           arg &&
diff --git a/tests/functions/runQuery.ts b/tests/functions/runQuery.ts
index b022ca3..ec11cee 100644
--- a/tests/functions/runQuery.ts
+++ b/tests/functions/runQuery.ts
@@ -9,7 +9,7 @@ export default async (token: string, queryData: Record<string, any>) => {
       {
         headers: {
           "x-api-token": "efbeccd6-dde1-47dc-b3aa-4fbd773d5429",
-          Cookie: `x-session-id=gTEd90aRJFmLzJKu_1760193754588`,
+          Cookie: `x-session-id=cqfqc4G3K8JX7JjQ_1760336438448`,
         },
       }
     );