diff --git a/.github-disabled/workflows/00-run-unit-tests.yml b/.github-disabled/workflows/00-run-unit-tests.yml
index f4e8f699946b44af166b91e163acef89515166ae..71bce5287d63a7956f5f765c82891221d3882625 100644
--- a/.github-disabled/workflows/00-run-unit-tests.yml
+++ b/.github-disabled/workflows/00-run-unit-tests.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Load dependencies
         run: |
          go get github.com/johnaoss/htpasswd/apr1
-         go get github.com/xanzy/go-gitlab
+         go get gitlab.com/gitlab-org/api/client-go
          go get k8s.io/api/core/v1
          go get k8s.io/apimachinery/pkg/apis/meta/v1
          go get k8s.io/apimachinery/pkg/types
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2b976a3d0e0933dd4aa0ddf5417cda8168acb7d4..f1ee791ded767670e7b6606db80446fd90ff5496 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,7 +10,7 @@ test:
   script:
     - |
       go get github.com/johnaoss/htpasswd/apr1
-      go get github.com/xanzy/go-gitlab
+      go get gitlab.com/gitlab-org/api/client-go
       go get k8s.io/api/core/v1
       go get k8s.io/apimachinery/pkg/apis/meta/v1
       go get k8s.io/apimachinery/pkg/types
diff --git a/Dockerfile b/Dockerfile
index 6aab5b8198d1bd2ab76cb9c273a2ce4f22a5370a..501f9ff9c8d57ae3d3a34952c990eebd6752f10c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,7 +11,7 @@ COPY go.mod/ .
 COPY go.sum/ .
 
 RUN go get github.com/johnaoss/htpasswd/apr1
-RUN go get github.com/xanzy/go-gitlab
+RUN go get gitlab.com/gitlab-org/api/client-go
 RUN go get k8s.io/api/core/v1
 RUN go get k8s.io/apimachinery/pkg/apis/meta/v1
 RUN go get k8s.io/apimachinery/pkg/types
diff --git a/docs/DEVELOPMENT.md b/docs/DEVELOPMENT.md
index a0d61cafdd5d653b92407f048b1c7e5f4decf5c9..0c84ba809a82e5d8f014eb3a8258fd6726a6d285 100644
--- a/docs/DEVELOPMENT.md
+++ b/docs/DEVELOPMENT.md
@@ -6,7 +6,7 @@
 * [Protobuf](https://protobuf.dev/)
 * [gRPC](https://grpc.io/)
 * [kubernetes/client-go](https://github.com/kubernetes/client-go)
-* [go-gitlab](https://pkg.go.dev/github.com/xanzy/go-gitlab)
+* [gitlab-org/api/client-go](https://gitlab.com/gitlab-org/api/client-go)
 
 ### Deploying
 
diff --git a/go.mod b/go.mod
index 935f9db771fc279bea6403020af6d3e46ac30486..bafe19760a70520168200922a580507e262d7f37 100644
--- a/go.mod
+++ b/go.mod
@@ -2,7 +2,7 @@ module gitlab.software.geant.org/nmaas/nmaas-janitor
 
 require (
    github.com/johnaoss/htpasswd v0.0.0-20190120213328-a0cc59f788da
-   github.com/xanzy/go-gitlab v0.115.0
+   gitlab.com/gitlab-org/api/client-go v0.128.0
    google.golang.org/grpc v1.72.0
    google.golang.org/protobuf v1.36.6
    k8s.io/api v0.32.4
@@ -56,6 +56,6 @@ require (
    sigs.k8s.io/yaml v1.4.0 // indirect
 )
 
-go 1.24.1
+go 1.24.2
 
-toolchain go1.24.1
+toolchain go1.24.2
diff --git a/pkg/api/cmd/server.go b/pkg/api/cmd/server.go
index 77ddb0de07359e86812860a7d2e4b878373ccafc..230b03bf1df69f2f4f02e6f9b42d790d6d5f6fba 100644
--- a/pkg/api/cmd/server.go
+++ b/pkg/api/cmd/server.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
-	"github.com/xanzy/go-gitlab"
+	"gitlab.com/gitlab-org/api/client-go"
 	"log"
 
 	"gitlab.software.geant.org/nmaas/nmaas-janitor/pkg/protocol/grpc"
diff --git a/pkg/service/v1/config-service.go b/pkg/service/v1/config-service.go
index 1298f818db11cc712a2268bd2cdd6e0bae1fd2a5..5ecea5f8a6eac54385b996450b4148845ae361d8 100644
--- a/pkg/service/v1/config-service.go
+++ b/pkg/service/v1/config-service.go
@@ -3,7 +3,7 @@ package v1
 import (
 	"context"
 	"encoding/base64"
-	"github.com/xanzy/go-gitlab"
+	"gitlab.com/gitlab-org/api/client-go"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 	apiv1 "k8s.io/api/core/v1"
diff --git a/pkg/service/v1/config-service_test.go b/pkg/service/v1/config-service_test.go
index cd15e521092ce820fb4e7ec8878c256ae78090d6..e1c6f1171cb534fe3272419f26259b864d5ce2cc 100644
--- a/pkg/service/v1/config-service_test.go
+++ b/pkg/service/v1/config-service_test.go
@@ -3,7 +3,7 @@ package v1
 import (
 	v1 "gitlab.software.geant.org/nmaas/nmaas-janitor/pkg/api/v1"
 	"context"
-	"github.com/xanzy/go-gitlab"
+	"gitlab.com/gitlab-org/api/client-go"
 	corev1 "k8s.io/api/core/v1"
 	appsv1 "k8s.io/api/apps/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"