diff --git a/Dockerfile b/Dockerfile
index ed4c2834a3a0b0f51c587ca5a0faa5b8fc1a448c..6accc596bb3ad02fd664511091df70e35df31f0f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/library/fedora:32
+FROM docker.io/library/fedora:35
 
 COPY resources/storage.conf /etc/containers/
 
diff --git a/resources/shell-tools/.gitlab-ci.yml b/resources/shell-tools/.gitlab-ci.yml
index e06e7ffe30df70acdad7def51f6919da11cf55ee..0273e2536396785c35b31cfd0bde8aa12091aa4a 100644
--- a/resources/shell-tools/.gitlab-ci.yml
+++ b/resources/shell-tools/.gitlab-ci.yml
@@ -4,7 +4,7 @@ stages:
 
 
 shell-tools-shellcheck:
-  image: docker.io/library/fedora:33
+  image: docker.io/library/fedora:35
   stage: shell-tools-lint
   before_script:
     - dnf install -y ShellCheck