diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9773dd41d..2c486b9d7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -48,9 +48,8 @@ stages:
       - webui/node_modules/
       - /root/.cache/go-build
       - /var/lib/dpkg/info
-    # ToDo: Comment our after update to Gitlab 16.0
-    # fallback_keys:
-    #   - $CI_PROJECT_NAME-debian-$CI_DEFAULT_BRANCH
+    fallback_keys:
+      - $CI_PROJECT_NAME-debian-$CI_DEFAULT_BRANCH
   before_script:
     - sysctl -w net.ipv6.conf.all.disable_ipv6=1
     - sysctl -w net.ipv6.conf.default.disable_ipv6=1
@@ -69,9 +68,8 @@ stages:
       - tools/
       - webui/node_modules/
       - /root/.cache/go-build
-    # ToDo: Comment our after update to Gitlab 16.0
-    # fallback_keys:
-    #   - $CI_PROJECT_NAME-ubi-$CI_DEFAULT_BRANCH
+    fallback_keys:
+      - $CI_PROJECT_NAME-ubi-$CI_DEFAULT_BRANCH
   image: registry.gitlab.isc.org/isc-projects/stork/pkgs-redhat-ubi8:latest
   tags:
     - linux
@@ -216,9 +214,8 @@ build_apks:
     paths:
       - webui/node_modules/
       - tools/
-    # ToDo: Comment our after update to Gitlab 16.0
-    # fallback_keys:
-    #   - $CI_PROJECT_NAME-alpine-$CI_DEFAULT_BRANCH
+    fallback_keys:
+      - $CI_PROJECT_NAME-alpine-$CI_DEFAULT_BRANCH
   image: golang:1.18-alpine3.15
   tags:
     - linux
@@ -359,9 +356,8 @@ system_testing:
     key: $CI_PROJECT_NAME-compose-$CI_COMMIT_REF_SLUG
     paths:
       - tools/
-    # ToDo: Comment our after update to Gitlab 16.0
-    # fallback_keys:
-    #   - $CI_PROJECT_NAME-compose-$CI_DEFAULT_BRANCH
+    fallback_keys:
+      - $CI_PROJECT_NAME-compose-$CI_DEFAULT_BRANCH
   before_script:
     - ip -6 route del default
     - apk update