diff --git a/internal/provider/app_data_source.go b/internal/provider/app_data_source.go
index 2ea12cf..676789e 100644
--- a/internal/provider/app_data_source.go
+++ b/internal/provider/app_data_source.go
@@ -27,8 +27,6 @@ type AppDataSourceModel struct {
 	Organization types.String `tfsdk:"organization"`
 	Version      types.String `tfsdk:"version"`
 	Region       types.String `tfsdk:"region"`
-	Description  types.String `tfsdk:"description"`
-	Status       types.String `tfsdk:"status"`
 }
 
 func (d *AppDataSource) Metadata(ctx context.Context, req datasource.MetadataRequest, resp *datasource.MetadataResponse) {
@@ -106,8 +104,6 @@ func (d *AppDataSource) Read(ctx context.Context, req datasource.ReadRequest, re
 	data.Name = types.StringValue(app.Key.Name)
 	data.Organization = types.StringValue(app.Key.Organization)
 	data.Version = types.StringValue(app.Key.Version)
-	data.Description = types.StringValue("")
-	data.Status = types.StringValue("")
 
 	tflog.Trace(ctx, "read an app data source")
 
diff --git a/internal/provider/appinst_data_source.go b/internal/provider/appinst_data_source.go
index 8f83ce1..45e5431 100644
--- a/internal/provider/appinst_data_source.go
+++ b/internal/provider/appinst_data_source.go
@@ -29,7 +29,6 @@ type AppInstanceDataSourceModel struct {
 	CloudletOrganization types.String `tfsdk:"cloudlet_organization"`
 	Region               types.String `tfsdk:"region"`
 	AppId                types.String `tfsdk:"app_id"`
-	Status               types.String `tfsdk:"status"`
 }
 
 func (d *AppInstanceDataSource) Metadata(ctx context.Context, req datasource.MetadataRequest, resp *datasource.MetadataResponse) {
@@ -117,7 +116,6 @@ func (d *AppInstanceDataSource) Read(ctx context.Context, req datasource.ReadReq
 
 	data.Name = types.StringValue(appInstance.Key.Name)
 	data.AppId = types.StringValue(appInstance.AppKey.Name)
-	data.Status = types.StringValue(appInstance.State)
 
 	tflog.Trace(ctx, "read an app instance data source")
 
diff --git a/internal/provider/appinst_resource.go b/internal/provider/appinst_resource.go
index 381ca76..1cca25a 100644
--- a/internal/provider/appinst_resource.go
+++ b/internal/provider/appinst_resource.go
@@ -79,19 +79,23 @@ func (r *AppInstanceResource) Schema(ctx context.Context, req resource.SchemaReq
 			},
 			"app_name": schema.StringAttribute{
 				MarkdownDescription: "Application name",
-				Required:            true,
+				Required:            false,
+				Optional: true,
 			},
 			"app_version": schema.StringAttribute{
 				MarkdownDescription: "Application version",
-				Required:            true,
+				Required:            false,
+				Optional: true,
 			},
 			"app_organization": schema.StringAttribute{
 				MarkdownDescription: "Application organization",
-				Required:            true,
+				Required:            false,
+				Optional: true,
 			},
 			"flavor_name": schema.StringAttribute{
 				MarkdownDescription: "Flavor name",
-				Required:            true,
+				Required:            false,
+				Optional: true,
 			},
 			"state": schema.StringAttribute{
 				MarkdownDescription: "AppInstance state",