diff --git a/s390-tools.spec b/s390-tools.spec
index 7b0283d..78ea644 100644
--- a/s390-tools.spec
+++ b/s390-tools.spec
@@ -378,29 +378,42 @@ tar -xzf %{SOURCE201}
 export OPT_FLAGS="%{optflags}"
 export KERNELIMAGE_MAKEFLAGS="%%{?_smp_mflags}"
 
+export CC=gcc-%{gcc_version}
+export CXX=g++-%{gcc_version}
+
+%if %{gcc_version} < 13
+export CC=gcc-13
+export CXX=g++-13
+%endif
+
 %make_build \
      ZFCPDUMP_DIR=%{_prefix}/lib/s390-tools/zfcpdump \
      DISTRELEASE=%{release} \
      UDEVRUNDIR=/run/udev \
      HAVE_CARGO=1 \
-     HAVE_DRACUT=1 \
-     CC=gcc-13 \
-     CXX=g++-13
+     HAVE_DRACUT=1
 ###     all
 gcc-13 -static -o read_values ${OPT_FLAGS} %{SOURCE86} -lqc
 
 %install
 mkdir -p %{buildroot}/boot/zipl
 mkdir -p %{buildroot}%{_sysconfdir}/zkey/repository
+
+export CC=gcc-%{gcc_version}
+export CXX=g++-%{gcc_version}
+
+%if %{gcc_version} < 13
+export CC=gcc-13
+export CXX=g++-13
+%endif
+
 %make_install \
      ZFCPDUMP_DIR=%{_prefix}/lib/s390-tools/zfcpdump \
      DISTRELEASE=%{release} \
      SYSTEMDSYSTEMUNITDIR=%{_unitdir} \
      UDEVRUNDIR=/run/udev \
      HAVE_CARGO=1 \
-     HAVE_DRACUT=1 \
-     CC=gcc-13 \
-     CXX=g++-13
+     HAVE_DRACUT=1
 ###     all
 
 # The make install command puts things in /etc/sysconfig and not the
@@ -814,6 +827,15 @@ tar -xzf %{SOURCE201}
 %build
 export OPT_FLAGS="%{optflags}"
 export KERNELIMAGE_MAKEFLAGS="%%{?_smp_mflags}"
+
+export CC=gcc-%{gcc_version}
+export CXX=g++-%{gcc_version}
+
+%if %{gcc_version} < 13
+export CC=gcc-13
+export CXX=g++-13
+%endif
+
 %make_build \
      DISTRELEASE=%{release} \
      UDEVRUNDIR=/run/udev \
@@ -821,6 +843,15 @@ export KERNELIMAGE_MAKEFLAGS="%%{?_smp_mflags}"
      HAVE_DRACUT=1
 
 %install
+
+export CC=gcc-%{gcc_version}
+export CXX=g++-%{gcc_version}
+
+%if %{gcc_version} < 13
+export CC=gcc-13
+export CXX=g++-13
+%endif
+
 %make_install \
      DISTRELEASE=%{release} \
      SYSTEMDSYSTEMUNITDIR=%{_unitdir} \