diff --git a/application/src/main/data/upgrade/3.2.2/schema_update.sql b/application/src/main/data/upgrade/3.2.2/schema_update.sql
index e1a2952f64..77a5a9dbbe 100644
--- a/application/src/main/data/upgrade/3.2.2/schema_update.sql
+++ b/application/src/main/data/upgrade/3.2.2/schema_update.sql
@@ -69,7 +69,7 @@ CREATE TABLE IF NOT EXISTS firmware (
     content_type varchar(255),
     checksum_algorithm varchar(32),
     checksum varchar(1020),
-    data bytea,
+    data oid,
     data_size bigint,
     additional_info varchar,
     search_text varchar(255),
diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml
index b41f188dd6..b8308c6611 100644
--- a/application/src/main/resources/thingsboard.yml
+++ b/application/src/main/resources/thingsboard.yml
@@ -372,8 +372,8 @@ caffeine:
       timeToLiveInMinutes: 20000
       maxSize: 10000
     firmwares:
-      timeToLiveInMinutes: 1440
-      maxSize: 100
+      timeToLiveInMinutes: 60
+      maxSize: 10
     edges:
       timeToLiveInMinutes: 1440
       maxSize: 0
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/FirmwareEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/FirmwareEntity.java
index ccfa0229bd..690bb4e6d9 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/FirmwareEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/FirmwareEntity.java
@@ -30,6 +30,7 @@ import org.thingsboard.server.dao.util.mapping.JsonStringType;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 import java.nio.ByteBuffer;
 import java.util.UUID;
@@ -74,6 +75,7 @@ public class FirmwareEntity extends BaseSqlEntity<Firmware> implements SearchTex
     @Column(name = FIRMWARE_CHECKSUM_COLUMN)
     private String checksum;
 
+    @Lob
     @Column(name = FIRMWARE_DATA_COLUMN, columnDefinition = "BINARY")
     private byte[] data;
 
diff --git a/dao/src/main/resources/sql/schema-entities.sql b/dao/src/main/resources/sql/schema-entities.sql
index 7d7a18abc6..f71401ed57 100644
--- a/dao/src/main/resources/sql/schema-entities.sql
+++ b/dao/src/main/resources/sql/schema-entities.sql
@@ -186,7 +186,7 @@ CREATE TABLE IF NOT EXISTS firmware (
     content_type varchar(255),
     checksum_algorithm varchar(32),
     checksum varchar(1020),
-    data bytea,
+    data oid,
     data_size bigint,
     additional_info varchar,
     search_text varchar(255),