diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml
new file mode 100644
index 0000000..ef6fb76
--- /dev/null
+++ b/.github/workflows/codeql.yaml
@@ -0,0 +1,33 @@
+name: CodeQL
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+  schedule:
+    - cron: '0 0 * * 0'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'go' ]
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v3
+        with:
+          languages: ${{ matrix.language }}
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v3
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v3
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
new file mode 100644
index 0000000..acd0669
--- /dev/null
+++ b/.github/workflows/lint.yaml
@@ -0,0 +1,24 @@
+name: Lint
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+permissions:
+  contents: read
+
+jobs:
+  golangci:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: '1.24'
+      - name: Run golangci-lint
+        uses: golangci/golangci-lint-action@v3
+        with:
+          version: latest
diff --git a/README.md b/README.md
index 979036c..ac16417 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
 # SuhaibServer
 
 [![Build, Test, Publish](https://github.com/Suhaibinator/SuhaibServer/actions/workflows/ci.yaml/badge.svg)](https://github.com/Suhaibinator/SuhaibServer/actions/workflows/ci.yaml)
+[![Lint](https://github.com/Suhaibinator/SuhaibServer/actions/workflows/lint.yaml/badge.svg)](https://github.com/Suhaibinator/SuhaibServer/actions/workflows/lint.yaml)
+[![CodeQL](https://github.com/Suhaibinator/SuhaibServer/actions/workflows/codeql.yml/badge.svg)](https://github.com/Suhaibinator/SuhaibServer/actions/workflows/codeql.yml)
 
 **SuhaibServer** is a reverse proxy designed to simplify and enhance TLS and mTLS (Mutual TLS) management beyond what is typically possible in solutions like NGINX or Apache. By leveraging **SNI (Server Name Indication)**, SuhaibServer allows you to define highly granular routing and security policies per domain—right down to specific URLs and query parameters.
 
@@ -275,4 +277,5 @@ MTLSPolicy:
 
 ## License
 
-SuhaibServer is licensed under the [MIT License](LICENSE).  
\ No newline at end of file
+SuhaibServer is licensed under the [MIT License](LICENSE).  
+