diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 03ce154168055504be3269999ea23151388a1974..7d926cc285d637ab4c1ce52cddaa6f464824249e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,7 @@
 
 include:
   - template: Security/SAST-IaC.latest.gitlab-ci.yml
-  - project: cri/iac/infrastructure
+  - project: forge/infra/infrastructure
     file: .gitlab/ci/templates.yml
 
 stages:
diff --git a/defaults/main.yml b/defaults/main.yml
index 6af8fc99c17adf4da261baa46d5faebbc215e08d..63ba0f32622098bdd367f829f556890cc68ad90a 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,6 +1,6 @@
 ---
 
-gitlab_runner_version: '16.8.0'
+gitlab_runner_version: '16.11.4-1'
 
 gitlab_runner_concurrent: "{{ ansible_processor_vcpus }}"
 gitlab_runner_check_interval: 3
diff --git a/files/gitlab_runners.fact b/files/gitlab_runners.fact
index 29cf2c28934583f133f8fb3bbdc3b37e1109f8a8..378c2b6e92ce6a4184d4461f7e960eaf99eaae42 100644
--- a/files/gitlab_runners.fact
+++ b/files/gitlab_runners.fact
@@ -23,6 +23,7 @@ if len(output) < 3 or "runners" not in config:
     quit()
 
 output = output[3:]
+
 runners = []
 
 for runner in config["runners"]:
@@ -35,10 +36,14 @@ for runner in config["runners"]:
         }
     )
 
+
 for line in output:
     match_tok = regex_token.search(line.decode("utf8"))
     match_status = regex_status.search(line.decode("utf8"))
 
+    if match_status is None:
+        continue
+
     runner = next(
         (
             r
diff --git a/tasks/main.yml b/tasks/main.yml
index 4ace6d7a5b078d947ac58ad26476f9ad18bf6987..a2869e50b21be88435358e7d0097fc43ed7f4620 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -74,3 +74,9 @@
 
 - name: Add cronjob for pruning docker images at 3am
   ansible.builtin.cron: "{{ cron_prune_images | combine(gitlab_runner_prune_images_cron) | from_yaml }}"  # yamllint disable-line rule:line-length
+
+- name: Add gitlab-runner user to docker group
+  ansible.builtin.user:
+    name: gitlab-runner
+    groups: docker
+    append: true