diff --git a/cmd/openshift-install/create.go b/cmd/openshift-install/create.go
index f9af43bd7ea..e651f136ff7 100644
--- a/cmd/openshift-install/create.go
+++ b/cmd/openshift-install/create.go
@@ -42,6 +42,7 @@ import (
 	"github.com/openshift/installer/pkg/types/baremetal"
 	"github.com/openshift/installer/pkg/types/dns"
 	"github.com/openshift/installer/pkg/types/gcp"
+	"github.com/openshift/installer/pkg/types/openstack"
 	"github.com/openshift/installer/pkg/types/vsphere"
 	baremetalutils "github.com/openshift/installer/pkg/utils/baremetal"
 )
@@ -416,8 +417,8 @@ func waitForBootstrapComplete(ctx context.Context, config *rest.Config) *cluster
 
 	timeout := 45 * time.Minute
 
-	// Wait longer for baremetal, VSphere due to length of time it takes to boot
-	if platformName == baremetal.Name || platformName == vsphere.Name {
+	// Wait longer for baremetal, vSphere, and OpenStack due to length of time it takes to boot
+	if platformName == baremetal.Name || platformName == openstack.Name || platformName == vsphere.Name {
 		timeout = 60 * time.Minute
 	}
 	// For AWS, only increase timeout when UserProvisionedDNS is enabled
diff --git a/cmd/openshift-install/waitfor.go b/cmd/openshift-install/waitfor.go
index c5cb3a603fd..4c6f473dbe9 100644
--- a/cmd/openshift-install/waitfor.go
+++ b/cmd/openshift-install/waitfor.go
@@ -17,6 +17,8 @@ import (
 	"github.com/openshift/installer/pkg/types/aws"
 	"github.com/openshift/installer/pkg/types/baremetal"
 	"github.com/openshift/installer/pkg/types/dns"
+	"github.com/openshift/installer/pkg/types/openstack"
+	"github.com/openshift/installer/pkg/types/vsphere"
 )
 
 // getWaitOptionsFromInstallConfig constructs WaitOptions from an InstallConfig.
@@ -26,7 +28,7 @@ func getWaitOptionsFromInstallConfig(ic *types.InstallConfig) command.WaitOption
 	}
 	if ic != nil {
 		switch ic.Platform.Name() {
-		case baremetal.Name:
+		case baremetal.Name, openstack.Name, vsphere.Name:
 			options.ExtendTimeoutForBaremetal = true
 		case aws.Name:
 			if ic.AWS != nil &&