diff --git a/api/pkg/cmd/config.go b/api/pkg/cmd/config.go
index 3ce616f99e..bb976be7da 100644
--- a/api/pkg/cmd/config.go
+++ b/api/pkg/cmd/config.go
@@ -95,7 +95,11 @@ func (c *dbConfig) GetAllAppConfigs(payload *model.AppMetadata) ([]*model.AppCon
 		return nil, errors.Wrap(err, "[GetAllAppConfigs] unable to query app configs")
 	}
 
-	return entArrayToSharedModelArray(records), nil
+	results := make([]*model.AppConfig, len(records))
+	for idx, record := range records {
+		results[idx] = MakeAppConfigFromEnt(record)
+	}
+	return results, nil
 }
 
 // Returns only env-level configs for the given app and env
@@ -108,10 +112,9 @@ func (c *dbConfig) GetAppConfigsForEnv(payload *model.AppMetadata) ([]*model.Res
 		return nil, errors.Wrap(err, "[GetAppConfigsForEnv] unable to query app configs")
 	}
 
-	results := entArrayToSharedModelArray(records)
-	resolvedResults := []*model.ResolvedAppConfig{}
-	for _, result := range results {
-		resolvedResults = append(resolvedResults, model.NewResolvedAppConfig(result))
+	resolvedResults := make([]*model.ResolvedAppConfig, len(records))
+	for idx, record := range records {
+		resolvedResults[idx] = &model.ResolvedAppConfig{AppConfig: *MakeAppConfigFromEnt(record), Source: record.Source.String()}
 	}
 
 	return resolvedResults, nil
@@ -140,7 +143,7 @@ func (c *dbConfig) GetAppConfigsForStack(payload *model.AppMetadata) ([]*model.R
 
 	results := []*model.ResolvedAppConfig{}
 	for _, record := range resolvedMap {
-		results = append(results, model.NewResolvedAppConfig(MakeAppConfigFromEnt(record)))
+		results = append(results, &model.ResolvedAppConfig{AppConfig: *MakeAppConfigFromEnt(record), Source: record.Source.String()})
 	}
 
 	return results, nil
@@ -163,14 +166,6 @@ func rollback(tx *ent.Tx, err error) error {
 	return err
 }
 
-func entArrayToSharedModelArray(records []*ent.AppConfig) []*model.AppConfig {
-	results := make([]*model.AppConfig, len(records))
-	for idx, record := range records {
-		results[idx] = MakeAppConfigFromEnt(record)
-	}
-	return results
-}
-
 func (c *dbConfig) GetResolvedAppConfig(payload *model.AppConfigLookupPayload) (*model.ResolvedAppConfig, error) {
 	db := c.DB.GetDB()
 	records, err := appEnvScopedQuery(db.AppConfig, &payload.AppMetadata).
@@ -189,8 +184,8 @@ func (c *dbConfig) GetResolvedAppConfig(payload *model.AppConfigLookupPayload) (
 	}
 
 	// at most 2 records are defined and since we order by stack DESC, the first record is the stack-specific one if it exists
-	result := MakeAppConfigFromEnt(records[0])
-	return model.NewResolvedAppConfig(result), nil
+	record := records[0]
+	return &model.ResolvedAppConfig{AppConfig: *MakeAppConfigFromEnt(record), Source: record.Source.String()}, nil
 }
 
 func (c *dbConfig) DeleteAppConfig(payload *model.AppConfigLookupPayload) (*model.AppConfig, error) {
diff --git a/shared/model/config.go b/shared/model/config.go
index 9e820a793e..94f146531e 100644
--- a/shared/model/config.go
+++ b/shared/model/config.go
@@ -97,17 +97,6 @@ func NewAppConfigDiffPayload(appName, srcEnv, srcStack, destEnv, destStack strin
 	}
 }
 
-func NewResolvedAppConfig(appConfig *AppConfig) *ResolvedAppConfig {
-	source := "stack"
-	if appConfig.Stack == "" {
-		source = "environment"
-	}
-	return &ResolvedAppConfig{
-		AppConfig: *appConfig,
-		Source:    source,
-	}
-}
-
 // @Description App config key/value pair wrapped in "record" key
 type WrappedResolvedAppConfig struct {
 	Record *ResolvedAppConfig `json:"record"`