diff --git a/warewulf4.changes b/warewulf4.changes
index bafda5e..8a8a5f1 100644
--- a/warewulf4.changes
+++ b/warewulf4.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon May 27 17:21:53 UTC 2024 - Christian Goll <cgoll@suse.com>
+
+- added wwctl-configure-all-calls-SSH-keys.patch to fix
+  (bsc#1225402)
+
 -------------------------------------------------------------------
 Tue May 14 09:01:13 UTC 2024 - Christian Goll <cgoll@suse.com>
 
diff --git a/warewulf4.spec b/warewulf4.spec
index c6325f4..2226165 100644
--- a/warewulf4.spec
+++ b/warewulf4.spec
@@ -35,6 +35,7 @@ Source5:        warewulf4-rpmlintrc
 Source10:       config-ww4.sh
 Source11:       adjust_overlays.sh
 Source20:       README.dnsmasq
+Patch1:         wwctl-configure-all-calls-SSH-keys.patch
 
 # no firewalld in sle12
 %if 0%{?sle_version} >= 150000 || 0%{?suse_version} > 1500
diff --git a/wwctl-configure-all-calls-SSH-keys.patch b/wwctl-configure-all-calls-SSH-keys.patch
new file mode 100644
index 0000000..beaa69c
--- /dev/null
+++ b/wwctl-configure-all-calls-SSH-keys.patch
@@ -0,0 +1,21 @@
+diff --git a/internal/app/wwctl/configure/main.go b/internal/app/wwctl/configure/main.go
+index c663dc71..fad8c4af 100644
+--- a/internal/app/wwctl/configure/main.go
++++ b/internal/app/wwctl/configure/main.go
+@@ -4,6 +4,7 @@ import (
+ 	"os"
+ 
+ 	"github.com/spf13/cobra"
++	warewulfconf "github.com/warewulf/warewulf/internal/pkg/config"
+ 	"github.com/warewulf/warewulf/internal/pkg/configure"
+ 	"github.com/warewulf/warewulf/internal/pkg/wwlog"
+ )
+@@ -23,7 +24,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
+ 			os.Exit(1)
+ 		}
+ 
+-		err = configure.SSH()
++		err = configure.SSH(warewulfconf.Get().SSH.KeyTypes...)
+ 		if err != nil {
+ 			wwlog.Error("%s", err)
+ 			os.Exit(1)