diff --git a/deployments/gitlab-runner-manifest.yaml b/deployments/gitlab-runner-manifest.yaml
index b2ecdb304a39acf92f079aaa8b10eeadba6ddc6a..d940345539d1a834375c390b9509ffa69af0d3ee 100644
--- a/deployments/gitlab-runner-manifest.yaml
+++ b/deployments/gitlab-runner-manifest.yaml
@@ -104,13 +104,13 @@ data:
     check_interval = 30
     log_level = "info"
 
-
+  
   config.template.toml:   |
     [[runners]]
       [runners.kubernetes]
         namespace = "gitlab-runner-ns"
         image = "ubuntu:16.04"
-
+  
 
   register-the-runner: |
     #!/bin/bash
@@ -211,7 +211,7 @@ spec:
         checksum/configmap: c89b730e58e54e184a7540b77741eb6828c22fd5e31e3da1aff90aceea1e6a61
         checksum/secrets: fb396a24f5907af003946c5a491c0357f46fc69b161025ece63760674c591922
     spec:
-      securityContext:
+      securityContext: 
         fsGroup: 65533
         runAsUser: 100
       terminationGracePeriodSeconds: 3600
@@ -220,7 +220,7 @@ spec:
       - name: gitlab-runner
         image: registry.gitlab.com/gitlab-org/gitlab-runner:alpine-v15.3.0
         imagePullPolicy: "IfNotPresent"
-        securityContext:
+        securityContext: 
           allowPrivilegeEscalation: false
           capabilities:
             drop:
@@ -238,7 +238,7 @@ spec:
               command: ["/entrypoint", "unregister", "--all-runners"]
         command: ["/usr/bin/dumb-init", "--", "/bin/bash", "/configmaps/entrypoint"]
         env:
-
+                
         - name: CI_SERVER_URL
           value: "https://git.informatik.fh-nuernberg.de/"
         - name: CLONE_URL
@@ -251,6 +251,20 @@ spec:
           value: ""
         - name: KUBERNETES_PRIVILEGED
           value: "true"
+        - name: CACHE_TYPE
+          value: "s3"
+        - name: CACHE_PATH
+          value: "gitlab-runner"
+        - name: CACHE_SHARED
+          value: "true"
+        - name: CACHE_S3_SERVER_ADDRESS
+          value: "minio:9000"
+        - name: CACHE_S3_BUCKET_NAME
+          value: "gitlab-runner"
+        - name: CACHE_S3_BUCKET_LOCATION
+          value: ""
+        - name: CACHE_S3_INSECURE
+          value: "true"
         livenessProbe:
           exec:
             command: ["/bin/bash", "/configmaps/check-live"]
@@ -289,6 +303,9 @@ spec:
       - name: projected-secrets
         projected:
           sources:
+              # .Values.runners.cache.cacheType is deprecated: https://gitlab.com/gitlab-org/charts/gitlab-runner/-/issues/224
+            - secret:
+                name: "gitlab-runner-s3-access-secret"
             - secret:
                 name: "gitlab-runner"
                 items:
diff --git a/gitlab-agent b/gitlab-agent
new file mode 160000
index 0000000000000000000000000000000000000000..f6116b627dadf034c39ecc307c4dc970ec6eb300
--- /dev/null
+++ b/gitlab-agent
@@ -0,0 +1 @@
+Subproject commit f6116b627dadf034c39ecc307c4dc970ec6eb300