diff --git a/.gitignore b/.gitignore
index 1c66b8a42..72853bf32 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,5 @@
 .vscode
 .idea
 coverage.out
-vendor/
\ No newline at end of file
+vendor/
+.tool-versions
diff --git a/.golangci.yaml b/.golangci.yaml
index fbefc226d..c516a7c99 100644
--- a/.golangci.yaml
+++ b/.golangci.yaml
@@ -1,3 +1,3 @@
-run:
-  skip-files:
-    - "pkg/diff/internal/fieldmanager/borrowed_.+\\.go$"
+issues:
+  exclude-files:
+    - "pkg/diff/internal/fieldmanager/borrowed_.*\\.go$"
diff --git a/Dockerfile b/Dockerfile
index 73140debb..64208ef0f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.17 as builder
+FROM golang:1.22 AS builder
 
 WORKDIR /src
 
@@ -12,5 +12,5 @@ COPY . .
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-w -s" -o /dist/gitops ./agent
 
 
-FROM alpine/git:v2.24.3
+FROM alpine/git:v2.45.2
 COPY --from=builder /dist/gitops /usr/local/bin/gitops