diff --git a/CHANGELOG.md b/CHANGELOG.md
index 17b3d1b54..608459768 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@ FEATURES:
 
 * **New Resource**: `opennebula_marketplace` (#414)
 * **New Data Source**: `opennebula_marketplace` (#414)
-* **New Resource**: `opennebula_marketplace_appliance` (#476)
+* **New Resource**: `opennebula_marketplace_appliance` (#476, #518)
 * **New Data Source**: `opennebula_marketplace_appliance` (#476)
 * resources/opennebula_virtual_router_nic: add floating IP allocation (#510)
 
@@ -412,7 +412,8 @@ DEPRECATION:
 
 FEATURES:
 
-* **New Resource**** New Data Source**: opennebula_user : First implementation ([#69](https://github.com/OpenNebula/terraform-provider-opennebula/issues/69))
+* **New Resource**: opennebula_user : First implementation ([#69](https://github.com/OpenNebula/terraform-provider-opennebula/issues/69))
+* **New Data Source**: opennebula_user : First implementation ([#69](https://github.com/OpenNebula/terraform-provider-opennebula/issues/69))
 * resources/opennebula_virtual_machine: Enable VM disk update ([#64](https://github.com/OpenNebula/terraform-provider-opennebula/issues/64))
 * resources/opennebula_virtual_machine: Change 'image_id' disk attribute from Required to Optional ([#71](https://github.com/OpenNebula/terraform-provider-opennebula/issues/71))
 * **New Resource**: `opennebula_service`: First implementation ([oneflow](http://docs.opennebula.io/5.12/integration/system_interfaces/appflow_api.html#service)),
diff --git a/opennebula/resource_opennebula_marketplace_app.go b/opennebula/resource_opennebula_marketplace_app.go
index e64ca1ffa..d485c4ab2 100644
--- a/opennebula/resource_opennebula_marketplace_app.go
+++ b/opennebula/resource_opennebula_marketplace_app.go
@@ -287,7 +287,7 @@ func resourceOpennebulaMarketPlaceAppCreate(ctx context.Context, d *schema.Resou
 	ac := controller.MarketPlaceApp(appID)
 
 	timeout := d.Timeout(schema.TimeoutCreate)
-	_, err = waitForMarketAppStates(ctx, ac, timeout, []string{app.Init.String(), app.Ready.String()}, []string{app.Ready.String()})
+	_, err = waitForMarketAppStates(ctx, ac, timeout, []string{app.Init.String(), app.Ready.String(), app.Locked.String()}, []string{app.Ready.String()})
 	if err != nil {
 		diags = append(diags, diag.Diagnostic{
 			Severity: diag.Error,