diff --git a/Dockerfile b/Dockerfile
index fae0d3c68dad7f5549f2570f1cf1356fb35c8e0e..71ef0f15065494ddab1c937b80bd6edd8b98b159 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/library/fedora:35
+FROM docker.io/library/fedora:40
 
 COPY resources/storage.conf /etc/containers/
 
diff --git a/resources/shell-tools/.gitlab-ci.yml b/resources/shell-tools/.gitlab-ci.yml
index 62a373d7c3cc6eed86b72648b5a71698769b90bf..6079895d75a854033907982f74fc100b700926d3 100644
--- a/resources/shell-tools/.gitlab-ci.yml
+++ b/resources/shell-tools/.gitlab-ci.yml
@@ -3,7 +3,7 @@ stages:
   - shell-tools-test
 
 shell-tools-shellcheck:
-  image: docker.io/library/fedora:36
+  image: docker.io/library/fedora:40
   stage: shell-tools-lint
   before_script:
     - dnf install -y ShellCheck