diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 0000000..9276669
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1 @@
+*       @gignsky
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000..f9679de
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,18 @@
+version: 2
+updates:
+  # Rust/Cargo dependencies
+  - package-ecosystem: "cargo"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+    labels:
+      - "dependencies"
+  # GitHub Actions dependencies
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 5
+    labels:
+      - "dependencies"
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 0d639c6..08add2c 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -21,7 +21,7 @@ jobs:
         with:
             toolchain: stable
             override: true
-            components: rustfmt, clippy
+            components: rustfmt
 
       - name: Run cargo test
         uses: actions-rs/cargo@v1
@@ -39,7 +39,7 @@ jobs:
         with:
             toolchain: stable
             override: true
-            components: rustfmt, clippy
+            components: rustfmt
 
       - name: Run cargo check
         uses: actions-rs/cargo@v1
@@ -64,21 +64,3 @@ jobs:
         with:
           command: fmt
           args: --all -- --check
-
-  clippy:
-    name: Clippy
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-            toolchain: stable
-            override: true
-            components: clippy
-
-      - name: Run cargo clippy
-        uses: actions-rs/cargo@v1
-        with:
-          command: clippy
-          args: --all-targets --all-features -- -D warnings
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 0987aaa..45deb22 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -3,6 +3,13 @@ on:
   push:
     branches:
       - main
+  pull_request:
+    branches:
+      - develop
+      - release/*
+      - hotfix/*
+      - bugfix/*
+
 permissions:
   contents: read
   pages: write
diff --git a/.github/workflows/ci-nix.yml b/.github/workflows/flake-check.yml
similarity index 64%
rename from .github/workflows/ci-nix.yml
rename to .github/workflows/flake-check.yml
index 3924aa8..0e42ec5 100644
--- a/.github/workflows/ci-nix.yml
+++ b/.github/workflows/flake-check.yml
@@ -21,14 +21,5 @@ jobs:
           extra_nix_config: |
             experimental-features = nix-command flakes
       - name: Run nix flake check
-        run: NIX_SKIP_TEMPLATE=1 nix flake check --show-trace --impure --no-build
+        run: NIX_SKIP_TEMPLATE=1 nix flake check --show-trace --impure --print-build-logs
         
-  omnix-ci:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: DeterminateSystems/nix-installer-action@main
-      - name: Install omnix
-        run: nix --accept-flake-config profile install "github:juspay/omnix"
-      - name: Run omnix ci
-        run: om ci --no-build
diff --git a/.github/workflows/help-to-readme.yml b/.github/workflows/help-to-readme.yml
index a8d7a86..7a9e78b 100644
--- a/.github/workflows/help-to-readme.yml
+++ b/.github/workflows/help-to-readme.yml
@@ -1,15 +1,20 @@
 name: Update README with --help Output
 
 on:
-    pull_request:
-        branches:
-            - release/*
-            - hotfix/*
-            - bugfix/*
-            - main
+  push:
+    branches:
+      - main
+      - develop
+      - release/*
+      - hotfix/*
+      - bugfix/*  
+  pull_request:
+    branches:
+        - release/*
+        - hotfix/*
+        - bugfix/*
+        - main
             
-    workflow_dispatch:
-
 jobs:
   update-readme:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/template-check.yml b/.github/workflows/template-check.yml
deleted file mode 100644
index e90552a..0000000
--- a/.github/workflows/template-check.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-# yamllint disable rule:truthy
----
-name: Template & Flake Check
-
-on:
-  push:
-    branches:
-      - main
-      - develop
-  pull_request:
-    branches:
-      - main
-      - develop
-
-jobs:
-  template-check:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Install Nix
-        uses: cachix/install-nix-action@v27
-        with:
-          extra_nix_config: |
-            experimental-features = nix-command flakes
-      - name: Run template-specific flake check
-        run: nix flake check --show-trace --impure --no-build
-      - name: Test omnix template processing
-        run: |
-          nix --accept-flake-config run github:juspay/omnix -- ci --no-build
-
-  regular-flake-check:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Install Nix
-        uses: cachix/install-nix-action@v27
-        with:
-          extra_nix_config: |
-            experimental-features = nix-command flakes
-      - name: Run regular flake check (skip template)
-        run: NIX_SKIP_TEMPLATE=1 nix flake check --show-trace --impure --no-build
diff --git a/nix/modules/template.nix b/nix/modules/template.nix
index fdbe2b4..1982f61 100644
--- a/nix/modules/template.nix
+++ b/nix/modules/template.nix
@@ -31,7 +31,6 @@
           description = "Include GitHub Actions workflow configuration";
           paths = [
             ".github/**"
-            "!.github/workflows/template-check.yml"
           ];
           value = true;
         }
@@ -40,7 +39,6 @@
           description = "Keep the flake template in the project";
           paths = [
             "**/template.nix"
-            ".github/workflows/template-check.yml"
           ];
           value = false;
         }
@@ -64,7 +62,6 @@
               ".github/workflows/help-to-readme.yml" = true;
               ".github/workflows/release.yml" = true;
               "nix/modules/template.nix" = false;
-              ".github/workflows/template-check.yml" = false;
             };
             packages.default = {
               "bin/qux" = true;