diff --git a/kernel/Dockerfile b/kernel/Dockerfile
index a7726c67a..0a4cc9ee1 100644
--- a/kernel/Dockerfile
+++ b/kernel/Dockerfile
@@ -90,6 +90,7 @@ RUN mkdir -p /out/src
 RUN tar cJf /out/src/linux.tar.xz /linux
 
 # Kernel config
+# The s390x defconfig moved with 5.2.x
 RUN case $(uname -m) in \
     x86_64) \
         KERNEL_DEF_CONF=/linux/arch/x86/configs/x86_64_defconfig; \
@@ -98,7 +99,11 @@ RUN case $(uname -m) in \
         KERNEL_DEF_CONF=/linux/arch/arm64/configs/defconfig; \
         ;; \
     s390x) \
-        KERNEL_DEF_CONF=/linux/arch/s390/defconfig; \
+        if [ -f /linux/arch/s390/defconfig ]; then \
+            KERNEL_DEF_CONF=/linux/arch/s390/defconfig; \
+        else \
+            KERNEL_DEF_CONF=/linux/arch/s390/configs/defconfig; \
+        fi; \
         ;; \
     esac  && \
     cp /config-${KERNEL_SERIES}-$(uname -m) ${KERNEL_DEF_CONF}; \
diff --git a/kernel/Dockerfile.kconfig b/kernel/Dockerfile.kconfig
index 9f2224941..cc3f1b005 100644
--- a/kernel/Dockerfile.kconfig
+++ b/kernel/Dockerfile.kconfig
@@ -43,7 +43,13 @@ RUN set -e && \
         fi && \
         [ ! -f /config-${SERIES}-x86_64 ] || mv /config-${SERIES}-x86_64 arch/x86/configs/x86_64_defconfig && \
         [ ! -f /config-${SERIES}-aarch64 ] || mv /config-${SERIES}-aarch64 arch/arm64/configs/defconfig ; \
-        [ ! -f /config-${SERIES}-s390x ] || mv /config-${SERIES}-s390x arch/s390/defconfig; \
+        if [ -f /config-${SERIES}-s390x ]; then \
+            if [ -f /linux/arch/s390/defconfig ]; then \
+                mv /config-${SERIES}-s390x arch/s390/defconfig; \
+            else \
+                mv /config-${SERIES}-s390x arch/s390/configs/defconfig; \
+            fi; \
+        fi; \
     done
 
 ENTRYPOINT ["/bin/sh"]