diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 634e8781e0708fccaae1792aee789954f3704435..d787507473782e050d0da13f940ef3953dd418e1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,14 +36,14 @@ alma9:
   image: gitlab-registry.cern.ch/linuxsupport/alma9-base
   <<: *build-template_definition
 
-fedora-36:
-  image: fedora:36
-  <<: *build-template_definition
-
 fedora-37:
   image: fedora:37
   <<: *build-template_definition
 
+fedora-38:
+  image: fedora:38
+  <<: *build-template_definition
+
 fedora-rawhide:
   image: fedora:rawhide
   <<: *build-template_definition
@@ -61,8 +61,8 @@ fedora-rawhide:
     - cc7
     - alma8
     - alma9
-    - fedora-36
     - fedora-37
+    - fedora-38
     - fedora-rawhide
   script:
     - yum install -y python sssd-client sudo createrepo
@@ -70,7 +70,7 @@ fedora-rawhide:
     - cat "$repo_passwd" | kinit "$repo_user"
     - eosfusebind
     - |
-        for platform in cc7 alma8 alma9 fedora-36 fedora-37 fedora-rawhide; do
+        for platform in cc7 alma8 alma9 fedora-37 fedora-38 fedora-rawhide; do
           if [[ "${platform}" == "fedora-rawhide" ]] && [[ ! -d ${platform} ]] ; then
             echo "Skipping ${platform} packages..." ;
             continue ;
diff --git a/packaging/gfal2-repo-manager.py b/packaging/gfal2-repo-manager.py
index be819f173abb8ab2427077ea103b307eae21e108..d2427b8bd416d28d72d35db57faf5c0aa7e8f81d 100755
--- a/packaging/gfal2-repo-manager.py
+++ b/packaging/gfal2-repo-manager.py
@@ -5,7 +5,7 @@ import os, subprocess, sys, inspect, argparse, re, shutil, errno
 
 DRY_RUN = False
 NO_CREATE_REPO = False
-RAWHIDE_VERSIONS = ["fc38", "fc39"]
+RAWHIDE_VERSIONS = ["fc39", "fc40"]
 
 def sh(cmd):
     # poor man's subprocess.check_output, not supported on SL6