diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index eb0037a..fc0e8bc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,7 @@ stages:
 
 run-pre-commit:
   stage: .pre
-  image: golang:1.19
+  image: unbound/pre-commit
   variables:
     PRE_COMMIT_HOME: ${CI_PROJECT_DIR}/.cache/pre-commit
   cache:
@@ -18,11 +18,6 @@ run-pre-commit:
       - .pre-commit-config.yaml
     paths:
     - ${PRE_COMMIT_HOME}
-  before_script:
-  - apt update && apt install -y python3 python3-pip ruby git
-  - go install github.com/lietu/go-pre-commit@latest
-  - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.49.0
-  - pip install pre-commit
   script:
   - pre-commit run --all-files
 
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 1136595..f4453c3 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -24,16 +24,17 @@ repos:
   - id: commitlint
     stages: [ commit-msg ]
     additional_dependencies: [ '@commitlint/config-conventional' ]
-- repo: https://github.com/lietu/go-pre-commit
-  rev: v0.0.1
-  hooks:
-  - id: errcheck
-  - id: go-fmt-goimports
-  - id: go-test
-  - id: golangci-lint
-  - id: gofumpt
-  - id: staticcheck
 - repo: https://github.com/dnephin/pre-commit-golang
   rev: v0.5.1
   hooks:
   - id: go-mod-tidy
+  - id: go-imports
+    args:
+    - -local
+    - gitlab.com/unboundsoftware/shiny/authz_client
+- repo: https://github.com/lietu/go-pre-commit
+  rev: v0.0.1
+  hooks:
+  - id: go-test
+  - id: golangci-lint
+  - id: gofumpt