diff --git a/builder/oracle/classic/builder.go b/builder/oracle/classic/builder.go
index 875604de1..bab170e3e 100644
--- a/builder/oracle/classic/builder.go
+++ b/builder/oracle/classic/builder.go
@@ -118,6 +118,9 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 			&stepCreateImage{
 				uploadImageCommand: b.config.BuilderUploadImageCommand,
 			},
+			&common.StepCleanupTempKeys{
+				Comm: &b.config.Comm,
+			},
 		}
 	} else {
 		// Build the steps
@@ -140,9 +143,6 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 			&common.StepCleanupTempKeys{
 				Comm: &b.config.Comm,
 			},
-			&common.StepCleanupTempKeys{
-				Comm: &b.config.Comm,
-			},
 			&stepSnapshot{},
 			&stepListImages{},
 		}