diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index a3ead1c7..e0d1222f 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,12 +1,90 @@
 fail_fast: true
 repos:
 -   repo: https://github.com/tekwizely/pre-commit-golang
-    rev: v1.0.0-beta.5
+    rev: master
     hooks:
-    -   id: golangci-lint-mod
-        args: ["--allow-parallel-runners"]
+    # Go Build
+    #
+    -   id: go-build-mod
+    -   id: go-build-pkg
     -   id: go-build-repo-mod
+    -   id: go-build-repo-pkg
+    #
+    # Go Mod Tidy
+    #
     -   id: go-mod-tidy
     -   id: go-mod-tidy-repo
+    #
+    # Go Test
+    #
+    -   id: go-test-mod
+    -   id: go-test-pkg
+    -   id: go-test-repo-mod
+    -   id: go-test-repo-pkg
+    #
+    # Go Vet
+    #
+    -   id: go-vet
     -   id: go-vet-mod
+    -   id: go-vet-pkg
+    -   id: go-vet-repo-mod
+    -   id: go-vet-repo-pkg
+    #
+    # Revive
+    #
+    -   id: go-revive
+    -   id: go-revive-mod
+    -   id: go-revive-repo-mod
+    #
+    # GoSec
+    #
+    -   id: go-sec-mod
+    -   id: go-sec-pkg
+    -   id: go-sec-repo-mod
+    -   id: go-sec-repo-pkg
+    #
+    # StaticCheck
+    #
+    -   id: go-staticcheck-mod
+    -   id: go-staticcheck-pkg
+    -   id: go-staticcheck-repo-mod
+    -   id: go-staticcheck-repo-pkg
+    #
+    # StructSlop
+    #
+    -   id: go-structslop-mod
+    -   id: go-structslop-pkg
+    -   id: go-structslop-repo-mod
+    -   id: go-structslop-repo-pkg
+    #
+    # Formatters
+    #
     -   id: go-fmt
+    -   id: go-fmt-repo
+    -   id: go-fumpt        # replaces go-fmt
+    -   id: go-fumpt-repo   # replaces go-fmt-repo
+    -   id: go-imports      # replaces go-fmt
+    -   id: go-imports-repo # replaces go-fmt-repo
+    -   id: go-returns      # replaces go-imports & go-fmt
+    -   id: go-returns-repo # replaces go-imports-repo & go-fmt-repo
+    #
+    # Style Checkers
+    #
+    -   id: go-lint
+    -   id: go-critic
+    #
+    # GolangCI-Lint
+    # - Fast Multi-Linter
+    # - Can be configured to replace MOST other hooks
+    # - Supports repo config file for configuration
+    # - https://github.com/golangci/golangci-lint
+    #
+    -   id: golangci-lint
+    -   id: golangci-lint-mod
+        args: ["--allow-parallel-runners"]
+    -   id: golangci-lint-pkg
+    -   id: golangci-lint-repo-mod
+    -   id: golangci-lint-repo-pkg
+
+
+