diff --git a/aggregator-server/internal/database/queries/storage_metrics.go b/aggregator-server/internal/database/queries/storage_metrics.go
index 3c4eea3..4f990ec 100644
--- a/aggregator-server/internal/database/queries/storage_metrics.go
+++ b/aggregator-server/internal/database/queries/storage_metrics.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/Fimeg/RedFlag/aggregator-server/internal/models"
 	"github.com/google/uuid"
-	"github.com/lib/pq"
 )
 
 // StorageMetricsQueries handles storage metrics database operations
diff --git a/aggregator-server/internal/models/storage_metrics.go b/aggregator-server/internal/models/storage_metrics.go
index 8bd8dde..a4acb1a 100644
--- a/aggregator-server/internal/models/storage_metrics.go
+++ b/aggregator-server/internal/models/storage_metrics.go
@@ -19,7 +19,7 @@ type StorageMetric struct {
 	AvailableBytes int64                  `json:"available_bytes" db:"available_bytes"`
 	UsedPercent    float64                `json:"used_percent" db:"used_percent"`
 	Severity       string                 `json:"severity" db:"severity"`
-	Metadata       map[string]interface{} `json:"metadata,omitempty" db:"metadata"`
+	Metadata       JSONB                  `json:"metadata,omitempty" db:"metadata"`
 	CreatedAt      time.Time              `json:"created_at" db:"created_at"`
 }
 
diff --git a/scripts/build-secure-agent.sh b/scripts/build-secure-agent.sh
index 63d24e2..cfa33c4 100755
--- a/scripts/build-secure-agent.sh
+++ b/scripts/build-secure-agent.sh
@@ -4,11 +4,11 @@
 
 set -e
 
-echo "🔨 RedFlag Agent Build"
-echo "====================="
+echo "[INFO] [build] RedFlag Agent Build"
+echo "================================="
 
 # Build agent
-echo "Building agent..."
+echo "[INFO] [build] Building agent..."
 cd aggregator-agent
 
 go build \
@@ -17,7 +17,7 @@ go build \
 
 cd ..
 
-echo "✅ Agent build complete!"
+echo "[INFO] [build] Agent build complete!"
 echo "   Binary: aggregator-agent/redflag-agent"
 echo ""
-echo "ℹ️  Note: Agent will fetch the server's public key automatically at startup"
+echo "[INFO] [build] Note: Agent will fetch the server's public key automatically at startup"