diff --git a/builder/orangepi.yml b/builder/orangepi.yml
index a6c45a74..462db6f8 100644
--- a/builder/orangepi.yml
+++ b/builder/orangepi.yml
@@ -413,6 +413,11 @@
       with_fileglob:
         - "/etc/ssh/ssh_host*_key*"
 
+    - name: regenerate ssh keys
+      shell: "dpkg-reconfigure openssh-server"
+      args:
+        executable: /bin/bash
+
   handlers:
     - name: reload systemd services
       systemd:
diff --git a/builder/raspberrypi32.yml b/builder/raspberrypi32.yml
index 0f40e942..a3f97e7d 100644
--- a/builder/raspberrypi32.yml
+++ b/builder/raspberrypi32.yml
@@ -719,6 +719,11 @@
       with_fileglob:
         - "/etc/ssh/ssh_host*_key*"
 
+    - name: regenerate ssh keys
+      shell: "dpkg-reconfigure openssh-server"
+      args:
+        executable: /bin/bash
+
   handlers:
     - name: reload systemd services
       systemd:
diff --git a/builder/raspberrypi64.yml b/builder/raspberrypi64.yml
index 1c45d9bc..017b9580 100644
--- a/builder/raspberrypi64.yml
+++ b/builder/raspberrypi64.yml
@@ -580,6 +580,11 @@
       with_fileglob:
           - "/etc/ssh/ssh_host*_key*"
 
+    - name: regenerate ssh keys
+      shell: "dpkg-reconfigure openssh-server"
+      args:
+        executable: /bin/bash
+
   handlers:
     - name: reload systemd services
       systemd: