diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml
index 211fdec..8695ecc 100644
--- a/.github/workflows/trivy.yml
+++ b/.github/workflows/trivy.yml
@@ -7,12 +7,13 @@ on:
 
 permissions:
   contents: read
-  security-events: write
 
 jobs:
   trivy:
     name: Trivy Scan
     runs-on: ubuntu-latest
+    permissions:
+      security-events: write
 
     steps:
       - name: Checkout
diff --git a/README.md b/README.md
index d01704d..f821d4d 100644
--- a/README.md
+++ b/README.md
@@ -1,38 +1,32 @@
 # go-postgres-rest - PostgreSQL REST API Framework for Go
 
 <p align="center">
-  <img src="https://img.shields.io/github/v/release/aptlogica/go-postgres-rest?style=for-the-badge&logo=github" alt="GitHub Release">
   <img src="https://img.shields.io/badge/Go-1.26.2+-00ADD8?style=for-the-badge&logo=go&logoColor=white" alt="Go Version">
+  <img src="https://img.shields.io/github/v/release/aptlogica/go-postgres-rest?style=for-the-badge&logo=github" alt="GitHub Release">
   <img src="https://img.shields.io/badge/PostgreSQL-12+-4169E1?style=for-the-badge&logo=postgresql&logoColor=white" alt="PostgreSQL">
-  <img src="https://img.shields.io/badge/License-MIT-green?style=for-the-badge" alt="MIT License">
   <img src="https://img.shields.io/badge/Docker-Ready-2496ED?style=for-the-badge&logo=docker&logoColor=white" alt="Docker">
 </p>
 
 <p align="center">
-  <a href="https://github.com/aptlogica/go-postgres-rest/actions/workflows/ci.yml">
-    <img src="https://img.shields.io/github/actions/workflow/status/aptlogica/go-postgres-rest/ci.yml?branch=main&style=flat-square&logo=github-actions" alt="Build Status">
-  </a>
-  <a href="https://sonar.aptlogica.com/dashboard?id=aptlogica_go-postgres-rest_3356bc40-4059-4939-8cce-5e86bba44a39">
-    <img src="https://sonar.aptlogica.com/api/project_badges/measure?project=aptlogica_go-postgres-rest_3356bc40-4059-4939-8cce-5e86bba44a39&metric=coverage&token=sqb_152d71a0f9a3621514372a3e4c87460e3059bbc2" alt="Coverage">
-  </a>
+<a href="https://github.com/aptlogica/go-postgres-rest/actions/workflows/ci.yml">
+  <img src="https://github.com/aptlogica/go-postgres-rest/actions/workflows/ci.yml/badge.svg" alt="CI">
+</a>
+<a href="https://github.com/aptlogica/go-postgres-rest/actions/workflows/codeql.yml">
+  <img src="https://github.com/aptlogica/go-postgres-rest/actions/workflows/codeql.yml/badge.svg" alt="CodeQL">
+</a>
+  <a href="https://app.fossa.com/projects/git%2Bgithub.com%2Faptlogica%2Fgo-postgres-rest?ref=badge_shield&issueType=security" alt="FOSSA Status"><img src="https://app.fossa.com/api/projects/git%2Bgithub.com%2Faptlogica%2Fgo-postgres-rest.svg?type=shield&issueType=security"/></a>
 <a href="https://app.fossa.com/projects/git%2Bgithub.com%2Faptlogica%2Fgo-postgres-rest?ref=badge_shield" alt="FOSSA Status"><img src="https://app.fossa.com/api/projects/git%2Bgithub.com%2Faptlogica%2Fgo-postgres-rest.svg?type=shield"/></a>
-  <a href="https://sonar.aptlogica.com/dashboard?id=aptlogica_go-postgres-rest_3356bc40-4059-4939-8cce-5e86bba44a39">
-    <img src="https://sonar.aptlogica.com/api/project_badges/measure?project=aptlogica_go-postgres-rest_3356bc40-4059-4939-8cce-5e86bba44a39&metric=alert_status&token=sqb_152d71a0f9a3621514372a3e4c87460e3059bbc2" alt="Quality Gate">
-  </a>
-  <a href="https://sonar.aptlogica.com/dashboard?id=aptlogica_go-postgres-rest_3356bc40-4059-4939-8cce-5e86bba44a39">
-    <img src="https://sonar.aptlogica.com/api/project_badges/measure?project=aptlogica_go-postgres-rest_3356bc40-4059-4939-8cce-5e86bba44a39&metric=security_rating&token=sqb_152d71a0f9a3621514372a3e4c87460e3059bbc2" alt="Security Rating">
-  </a>
-  <img src="https://img.shields.io/github/go-mod/go-version/aptlogica/go-postgres-rest?style=flat-square&logo=go" alt="Go Module Version">
-  <img src="https://img.shields.io/github/issues/aptlogica/go-postgres-rest?style=flat-square" alt="Issues">
-  <img src="https://img.shields.io/github/stars/aptlogica/go-postgres-rest?style=flat-square" alt="Stars">
-  <img src="https://img.shields.io/badge/PRs-Welcome-brightgreen?style=flat-square" alt="PRs Welcome">
+  <a href="https://sonarcloud.io/dashboard?id=aptlogica_go-postgres-rest"><img src="https://sonarcloud.io/api/project_badges/measure?project=aptlogica_go-postgres-rest&metric=alert_status" alt="Quality Gate"></a>
+<a href="https://sonarcloud.io/dashboard?id=aptlogica_go-postgres-rest"><img src="https://sonarcloud.io/api/project_badges/measure?project=aptlogica_go-postgres-rest&metric=coverage" alt="Coverage"></a>
+<a href="https://sonarcloud.io/dashboard?id=aptlogica_go-postgres-rest"><img src="https://sonarcloud.io/api/project_badges/measure?project=aptlogica_go-postgres-rest&metric=security_rating" alt="Security"></a>
+</p>
+<p align="center">
+  <img src="https://img.shields.io/badge/License-MIT-green?style==flat-square" alt="MIT License">
 </p>
 
 > A comprehensive PostgreSQL REST API framework and Golang backend framework for enterprise-grade applications. This production-ready Postgres API server and open source database API provides high-level abstractions for building scalable REST APIs with advanced query building, schema management, bulk operations, database migrations, and performance optimization.
 
 
-[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Faptlogica%2Fgo-postgres-rest.svg?type=large)](https://app.fossa.com/projects/git%2Bgithub.com%2Faptlogica%2Fgo-postgres-rest?ref=badge_large)
-
 ## Overview
 
 **go-postgres-rest** is a Golang-based REST API service that provides a scalable and secure interface for interacting with PostgreSQL databases. It enables automatic exposure of database tables as REST endpoints, allowing applications to perform CRUD operations through simple HTTP requests. Designed for modern backend architectures, it helps developers rapidly build data-driven applications, internal tools, and low-code platforms while maintaining high performance and full control over database structure. This service simplifies backend development by transforming PostgreSQL into a flexible API layer that integrates seamlessly with web, mobile, and cloud applications.This service is designed to support modern data-driven applications, low-code platforms, and internal tools by simplifying database access through standardized HTTP APIs. It allows developers and teams to quickly build backend functionality while maintaining flexibility, performance, and full control over their data.