diff --git a/common/step_cleanup_temp_keys.go b/common/step_cleanup_temp_keys.go
index 1d5fec1e5..c44a5c723 100644
--- a/common/step_cleanup_temp_keys.go
+++ b/common/step_cleanup_temp_keys.go
@@ -38,12 +38,12 @@ func (s *StepCleanupTempKeys) Run(_ context.Context, state multistep.StateBag) m
 
 	ui.Say("Trying to remove ephemeral keys from authorized_keys files")
 
-	cmd.Command = fmt.Sprintf("sed -i.bak '/ssh-rsa.*%s$/d' ~/.ssh/authorized_keys; rm ~/.ssh/authorized_keys.bak", s.Comm.SSHTemporaryKeyPairName)
+	cmd.Command = fmt.Sprintf("sed -i.bak '/ %s$/d' ~/.ssh/authorized_keys; rm ~/.ssh/authorized_keys.bak", s.Comm.SSHTemporaryKeyPairName)
 	if err := cmd.StartWithUi(comm, ui); err != nil {
 		log.Printf("Error cleaning up ~/.ssh/authorized_keys; please clean up keys manually: %s", err)
 	}
 	cmd = new(packer.RemoteCmd)
-	cmd.Command = fmt.Sprintf("sudo sed -i.bak '/ssh-rsa.*%s$/d' /root/.ssh/authorized_keys; sudo rm /root/.ssh/authorized_keys.bak", s.Comm.SSHTemporaryKeyPairName)
+	cmd.Command = fmt.Sprintf("sudo sed -i.bak '/ %s$/d' /root/.ssh/authorized_keys; sudo rm /root/.ssh/authorized_keys.bak", s.Comm.SSHTemporaryKeyPairName)
 
 	if err := cmd.StartWithUi(comm, ui); err != nil {
 		log.Printf("Error cleaning up /root/.ssh/authorized_keys; please clean up keys manually: %s", err)