diff --git a/kojicli/Dockerfile b/kojicli/Dockerfile
index 25dbc968211883c4ba64b0dfb9f57f430ef62833..cb08b8f228fdc135ae5b3d562febb6b91cb5eceb 100644
--- a/kojicli/Dockerfile
+++ b/kojicli/Dockerfile
@@ -1,8 +1,8 @@
-FROM gitlab-registry.cern.ch/linuxsupport/c8-base:latest
+FROM gitlab-registry.cern.ch/linuxsupport/cs8-base:latest
 
-COPY linuxsupport8-stable.repo /etc/yum.repos.d/
+COPY linuxsupport8s-stable.repo /etc/yum.repos.d/
 
-RUN dnf install -y epel-release \
+RUN dnf install -y epel-next-release \
   && dnf install -y koji python3-koji-cli-plugins krb5-workstation rpm-build \
   && dnf clean all
 
diff --git a/kojicli/linuxsupport8-stable.repo b/kojicli/linuxsupport8s-stable.repo
similarity index 60%
rename from kojicli/linuxsupport8-stable.repo
rename to kojicli/linuxsupport8s-stable.repo
index 1a126157cd140b091bf547457887310f3b23ccb6..fa99a0c60fb9f578bc5058271f786f5fcda7dc8f 100644
--- a/kojicli/linuxsupport8-stable.repo
+++ b/kojicli/linuxsupport8s-stable.repo
@@ -1,6 +1,6 @@
-[linuxsupport8-stable]
+[linuxsupport8s-stable]
 name=linuxsupport [stable]
-baseurl=http://linuxsoft.cern.ch/internal/repos/linuxsupport8-stable/$basearch/os
+baseurl=http://linuxsoft.cern.ch/internal/repos/linuxsupport8s-stable/$basearch/os
 enabled=1
 gpgcheck=False
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-koji file:///etc/pki/rpm-gpg/RPM-GPG-KEY-kojiv2