diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 5426aac..99b2138 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,3 +1,5 @@
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
 version: 2
 
 updates:
@@ -8,8 +10,7 @@ updates:
       interval: 'weekly'
     groups:
       github-actions:
-        patterns:
-          - '*'
+        patterns: ['*']
 
   - package-ecosystem: 'gomod'
     directory: '/'
@@ -19,7 +20,12 @@ updates:
     groups:
       gomod-security:
         applies-to: security-updates
+        update-types: ['minor', 'patch']
         patterns: ['*']
       gomod-update:
         applies-to: version-updates
+        update-types: ['minor', 'patch']
         patterns: ['*']
+    ignore:
+      - dependency-name: "*"
+        update-types: ["version-update:semver-major"]
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f0d4bf5..96b22e7 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -17,11 +17,10 @@ jobs:
         with:
           fetch-depth: 0
 
-      - run: git fetch --force --tags
-
       - uses: actions/setup-go@v5
         with:
-          go-version: 'stable'
+          check-latest: true
+          go-version-file: go.mod
 
       - uses: goreleaser/goreleaser-action@v6
         with:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1df0b56..f05e935 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches: [ main ]
   pull_request:
+  merge_group:
   workflow_dispatch:
 
 concurrency:
@@ -18,7 +19,8 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: 'stable'
+          check-latest: true
+          go-version-file: 'go.mod'
 
       - uses: gotesttools/gotestfmt-action@v2
         with:
@@ -29,7 +31,8 @@ jobs:
           version: latest
           args: --timeout=5m
 
-      - run: make test
+      - name: Run tests
+        run: GO_TEST_TAGS=-skip go test -coverprofile=coverage.out -race -json ./... | gotestfmt
 
       - uses: coverallsapp/github-action@v2
         with:
diff --git a/.gitignore b/.gitignore
index 47a6e8c..d6c329b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,25 @@
 .*
 *.log
 *.out
+
+/bin/
 /tmp/
-!.github/
-!.husky/
-!.editorconfig
+
+## Git
 !.gitignore
+
+## GitHub
+!.github/
+
+## Husky
+!.husky/
+!.husky.yaml
+
+## EditorConfig
+!.editorconfig
+
+## Go
 !.golangci.yml
 !.goreleaser.yml
-!.husky.yaml
 go.work
 go.work.sum
diff --git a/README.md b/README.md
index 241c32b..c2c3e5f 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
-
 [![Build Status](https://github.com/foomo/gocontemplate/actions/workflows/test.yml/badge.svg?branch=main&event=push)](https://github.com/foomo/gocontemplate/actions/workflows/test.yml)
 [![Go Report Card](https://goreportcard.com/badge/github.com/foomo/gocontemplate)](https://goreportcard.com/report/github.com/foomo/gocontemplate)
 [![GoDoc](https://godoc.org/github.com/foomo/gocontemplate?status.svg)](https://godoc.org/github.com/foomo/gocontemplate)
@@ -39,7 +38,7 @@ func main() {
 
 ## How to Contribute
 
-Please refer to the [CONTRIBUTING](.gihub/CONTRIBUTING.md) details and follow the [CODE_OF_CONDUCT](.gihub/CODE_OF_CONDUCT.md) and [SECURITY](.github/SECURITY.md) guidelines.
+Please refer to the [CONTRIBUTING](.github/CONTRIBUTING.md) details and follow the [CODE_OF_CONDUCT](.github/CODE_OF_CONDUCT.md) and [SECURITY](.github/SECURITY.md) guidelines.
 
 ## License