diff --git a/capten/agent/internal/api/cluster_plugin_apis.go b/capten/agent/internal/api/cluster_plugin_apis.go
index b9f96b87..95598562 100644
--- a/capten/agent/internal/api/cluster_plugin_apis.go
+++ b/capten/agent/internal/api/cluster_plugin_apis.go
@@ -17,8 +17,8 @@ func (a *Agent) GetClusterPlugins(ctx context.Context, request *clusterpluginspb
 	}
 
 	clusterPlugins := []*clusterpluginspb.ClusterPlugin{}
-	for idx, pluginConfig := range pluginConfigList {
-		clusterPlugins[idx] = &clusterpluginspb.ClusterPlugin{
+	for _, pluginConfig := range pluginConfigList {
+		clusterPlugins = append(clusterPlugins, &clusterpluginspb.ClusterPlugin{
 			StoreType:     pluginConfig.StoreType,
 			PluginName:    pluginConfig.PluginName,
 			Description:   pluginConfig.Description,
@@ -26,7 +26,7 @@ func (a *Agent) GetClusterPlugins(ctx context.Context, request *clusterpluginspb
 			Icon:          pluginConfig.Icon,
 			Version:       pluginConfig.Version,
 			InstallStatus: pluginConfig.InstallStatus,
-		}
+		})
 	}
 	return &clusterpluginspb.GetClusterPluginsResponse{
 		Status:  clusterpluginspb.StatusCode_OK,
diff --git a/capten/agent/internal/api/plugin_crossplane_project_apis.go b/capten/agent/internal/api/plugin_crossplane_project_apis.go
index 1518b91a..f0e75506 100644
--- a/capten/agent/internal/api/plugin_crossplane_project_apis.go
+++ b/capten/agent/internal/api/plugin_crossplane_project_apis.go
@@ -15,29 +15,25 @@ const (
 
 func (a *Agent) RegisterCrossplaneProject(ctx context.Context, request *captenpluginspb.RegisterCrossplaneProjectRequest) (
 	*captenpluginspb.RegisterCrossplaneProjectResponse, error) {
+	a.log.Infof("Register Crossplane Git project request recieved")
 
-	if err := validateArgs(request.Id); err != nil {
-		a.log.Infof("request validation failed", err)
+	crossplaneProject, err := a.as.GetCrossplaneProject()
+	if err != nil {
+		a.log.Infof("failed to get git project, %v", err)
 		return &captenpluginspb.RegisterCrossplaneProjectResponse{
 			Status:        captenpluginspb.StatusCode_INVALID_ARGUMENT,
 			StatusMessage: "request validation failed",
 		}, nil
 	}
-	a.log.Infof("Register Crossplane Git project %s request recieved", request.Id)
 
-	crossplaneProject, err := a.as.GetCrossplaneProjectForID(request.Id)
-	if err != nil {
-		a.log.Infof("failed to get git project %s, %v", request.Id, err)
-		return &captenpluginspb.RegisterCrossplaneProjectResponse{
-			Status:        captenpluginspb.StatusCode_INVALID_ARGUMENT,
-			StatusMessage: "request validation failed",
-		}, nil
+	if len(crossplaneProject.Status) == 0 {
+		crossplaneProject.Status = string(model.CrossplaneProjectAvailable)
 	}
 
 	if crossplaneProject.Status != string(model.CrossplaneProjectConfigurationFailed) &&
 		crossplaneProject.Status != string(model.CrossplaneProjectAvailable) &&
 		crossplaneProject.Status != string(model.CrossplaneProjectConfigured) {
-		a.log.Infof("currently the Crossplane project configuration on-going %s, %v", request.Id, crossplaneProject.Status)
+		a.log.Infof("currently the Crossplane project configuration on-going %s, %v", crossplaneProject.Id, crossplaneProject.Status)
 		return &captenpluginspb.RegisterCrossplaneProjectResponse{
 			Status:        captenpluginspb.StatusCode_OK,
 			StatusMessage: "Crossplane configuration on-going",
diff --git a/capten/common-pkg/capten-store/cluster_plugin_config_store.go b/capten/common-pkg/capten-store/cluster_plugin_config_store.go
index a1591d96..090fb49f 100644
--- a/capten/common-pkg/capten-store/cluster_plugin_config_store.go
+++ b/capten/common-pkg/capten-store/cluster_plugin_config_store.go
@@ -102,7 +102,7 @@ func (a *Store) GetAllClusterPluginConfigs() ([]*clusterpluginspb.Plugin, error)
 		return nil, fmt.Errorf("failed to fetch plugins: %v", err.Error())
 	}
 
-	var pluginConfigs []*clusterpluginspb.Plugin
+	pluginConfigs := []*clusterpluginspb.Plugin{}
 	for _, p := range plugins {
 		values, _ := base64.StdEncoding.DecodeString(p.Values)
 		overrideValues, _ := base64.StdEncoding.DecodeString(p.OverrideValues)