diff --git a/.github/workflows/pre-merge.yaml b/.github/workflows/pre-merge.yaml
index 1ec15e4..99a539f 100644
--- a/.github/workflows/pre-merge.yaml
+++ b/.github/workflows/pre-merge.yaml
@@ -28,7 +28,7 @@ jobs:
       - name: Install mockery
         env:
           # renovate: datasource=github-releases depName=vektra/mockery
-          MOCKERY_VERSION: v3.7.2
+          MOCKERY_VERSION: v3.8.1
         run: go install github.com/vektra/mockery/v3@${{ env.MOCKERY_VERSION }}
       - name: Verify generated mocks are up to date
         run: |
diff --git a/pkg/service/mocks.go b/pkg/service/mocks.go
index 756c353..0964f75 100644
--- a/pkg/service/mocks.go
+++ b/pkg/service/mocks.go
@@ -17,10 +17,19 @@ func NewMockInterfaceLister(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *MockInterfaceLister {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &MockInterfaceLister{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -99,10 +108,19 @@ func NewMockIPExtracter(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *MockIPExtracter {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &MockIPExtracter{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -177,10 +195,19 @@ func NewMockNodeAnnotater(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *MockNodeAnnotater {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &MockNodeAnnotater{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }