diff --git a/cli/azd/cmd/container.go b/cli/azd/cmd/container.go
index d48ddcefd11..70ed13fd86a 100644
--- a/cli/azd/cmd/container.go
+++ b/cli/azd/cmd/container.go
@@ -499,7 +499,7 @@ func registerCommonDependencies(container *ioc.NestedContainer) {
 
 	// Languages
 	frameworkServiceMap := map[project.ServiceLanguageKind]any{
-		project.ServiceLanguageNone:       project.NewNoneProject,
+		project.ServiceLanguageNone:       project.NewNoOpProject,
 		project.ServiceLanguageDotNet:     project.NewDotNetProject,
 		project.ServiceLanguageCsharp:     project.NewDotNetProject,
 		project.ServiceLanguageFsharp:     project.NewDotNetProject,
diff --git a/cli/azd/pkg/project/container_helper_test.go b/cli/azd/pkg/project/container_helper_test.go
index 044885afa26..ac5c87fa36a 100644
--- a/cli/azd/pkg/project/container_helper_test.go
+++ b/cli/azd/pkg/project/container_helper_test.go
@@ -110,7 +110,7 @@ func Test_Resolve_RegistryName(t *testing.T) {
 		envManager := &mockenv.MockEnvManager{}
 		containerHelper := NewContainerHelper(env, envManager, clock.NewMock(), nil, nil)
 		serviceConfig := createTestServiceConfig("./src/api", ContainerAppTarget, ServiceLanguageTypeScript)
-		serviceConfig.Docker.Registry = NewExpandableString("contoso.azurecr.io")
+		serviceConfig.Docker.Registry = osutil.NewExpandableString("contoso.azurecr.io")
 		registryName, err := containerHelper.RegistryName(*mockContext.Context, serviceConfig)
 
 		require.NoError(t, err)
@@ -124,7 +124,7 @@ func Test_Resolve_RegistryName(t *testing.T) {
 		envManager := &mockenv.MockEnvManager{}
 		containerHelper := NewContainerHelper(env, envManager, clock.NewMock(), nil, nil)
 		serviceConfig := createTestServiceConfig("./src/api", ContainerAppTarget, ServiceLanguageTypeScript)
-		serviceConfig.Docker.Registry = NewExpandableString("${MY_CUSTOM_REGISTRY}")
+		serviceConfig.Docker.Registry = osutil.NewExpandableString("${MY_CUSTOM_REGISTRY}")
 		registryName, err := containerHelper.RegistryName(*mockContext.Context, serviceConfig)
 
 		require.NoError(t, err)
diff --git a/cli/azd/pkg/project/framework_service_docker.go b/cli/azd/pkg/project/framework_service_docker.go
index ae2f834c3a5..9d4f14796b6 100644
--- a/cli/azd/pkg/project/framework_service_docker.go
+++ b/cli/azd/pkg/project/framework_service_docker.go
@@ -38,7 +38,7 @@ type DockerProjectOptions struct {
 	Platform  string                  `yaml:"platform,omitempty"  json:"platform,omitempty"`
 	Target    string                  `yaml:"target,omitempty"    json:"target,omitempty"`
 	Tag       osutil.ExpandableString `yaml:"tag,omitempty"       json:"tag,omitempty"`
-	Registry  ExpandableString `yaml:"registry,omitempty"  json:"registry,omitempty"`
+	Registry  osutil.ExpandableString `yaml:"registry,omitempty"  json:"registry,omitempty"`
 	BuildArgs []string                `yaml:"buildArgs,omitempty" json:"buildArgs,omitempty"`
 }
 
diff --git a/cli/azd/pkg/project/framework_service_none.go b/cli/azd/pkg/project/framework_service_none.go
deleted file mode 100644
index 9de158bb633..00000000000
--- a/cli/azd/pkg/project/framework_service_none.go
+++ /dev/null
@@ -1,75 +0,0 @@
-package project
-
-import (
-	"context"
-
-	"github.com/azure/azure-dev/cli/azd/pkg/async"
-	"github.com/azure/azure-dev/cli/azd/pkg/tools"
-)
-
-type NoneProject struct {
-}
-
-func NewNoneProject() FrameworkService {
-	return &NoneProject{}
-}
-
-func (n *NoneProject) RequiredExternalTools(ctx context.Context) []tools.ExternalTool {
-	return []tools.ExternalTool{}
-}
-
-func (n *NoneProject) Initialize(ctx context.Context, serviceConfig *ServiceConfig) error {
-	return nil
-}
-
-func (n *NoneProject) Requirements() FrameworkRequirements {
-	return FrameworkRequirements{
-		Package: FrameworkPackageRequirements{
-			RequireRestore: false,
-			RequireBuild:   false,
-			SkipPackage:    true,
-		},
-	}
-}
-
-func (n *NoneProject) Restore(
-	ctx context.Context,
-	serviceConfig *ServiceConfig,
-) *async.TaskWithProgress[*ServiceRestoreResult, ServiceProgress] {
-	return async.RunTaskWithProgress(
-		func(task *async.TaskContextWithProgress[*ServiceRestoreResult, ServiceProgress]) {
-			task.SetResult(&ServiceRestoreResult{})
-		},
-	)
-
-}
-
-func (m *NoneProject) Build(
-	ctx context.Context,
-	serviceConfig *ServiceConfig,
-	restoreOutput *ServiceRestoreResult,
-) *async.TaskWithProgress[*ServiceBuildResult, ServiceProgress] {
-	return async.RunTaskWithProgress(
-		func(task *async.TaskContextWithProgress[*ServiceBuildResult, ServiceProgress]) {
-			task.SetResult(&ServiceBuildResult{
-				Restore:         restoreOutput,
-				BuildOutputPath: serviceConfig.Path(),
-			})
-		},
-	)
-}
-
-func (m *NoneProject) Package(
-	ctx context.Context,
-	serviceConfig *ServiceConfig,
-	buildOutput *ServiceBuildResult,
-) *async.TaskWithProgress[*ServicePackageResult, ServiceProgress] {
-	return async.RunTaskWithProgress(
-		func(task *async.TaskContextWithProgress[*ServicePackageResult, ServiceProgress]) {
-			task.SetResult(&ServicePackageResult{
-				Build:       buildOutput,
-				PackagePath: serviceConfig.Path(),
-			})
-		},
-	)
-}
diff --git a/cli/azd/pkg/project/service_target_aks_test.go b/cli/azd/pkg/project/service_target_aks_test.go
index 46595c8a410..baf9cbaa611 100644
--- a/cli/azd/pkg/project/service_target_aks_test.go
+++ b/cli/azd/pkg/project/service_target_aks_test.go
@@ -161,7 +161,7 @@ func Test_Resolve_Cluster_Name(t *testing.T) {
 		serviceConfig := createTestServiceConfig(tempDir, AksTarget, ServiceLanguageTypeScript)
 		env := createEnv()
 
-		serviceTarget := createAksServiceTarget(mockContext, serviceConfig, env)
+		serviceTarget := createAksServiceTarget(mockContext, serviceConfig, env, nil)
 		err = simulateInitliaze(*mockContext.Context, serviceTarget, serviceConfig)
 		require.NoError(t, err)
 	})
@@ -172,13 +172,13 @@ func Test_Resolve_Cluster_Name(t *testing.T) {
 		require.NoError(t, err)
 
 		serviceConfig := createTestServiceConfig(tempDir, AksTarget, ServiceLanguageTypeScript)
-		serviceConfig.ResourceName = NewExpandableString("MY_AKS_CLUSTER")
+		serviceConfig.ResourceName = osutil.NewExpandableString("MY_AKS_CLUSTER")
 		env := createEnv()
 
 		// Remove default AKS cluster name from env file
 		env.DotenvDelete(environment.AksClusterEnvVarName)
 
-		serviceTarget := createAksServiceTarget(mockContext, serviceConfig, env)
+		serviceTarget := createAksServiceTarget(mockContext, serviceConfig, env, nil)
 		err = simulateInitliaze(*mockContext.Context, serviceTarget, serviceConfig)
 		require.NoError(t, err)
 	})
@@ -189,14 +189,14 @@ func Test_Resolve_Cluster_Name(t *testing.T) {
 		require.NoError(t, err)
 
 		serviceConfig := createTestServiceConfig(tempDir, AksTarget, ServiceLanguageTypeScript)
-		serviceConfig.ResourceName = NewExpandableString("$MY_CUSTOM_ENV_VAR")
+		serviceConfig.ResourceName = osutil.NewExpandableString("$MY_CUSTOM_ENV_VAR")
 		env := createEnv()
 		env.DotenvSet("MY_CUSTOM_ENV_VAR", "MY_AKS_CLUSTER")
 
 		// Remove default AKS cluster name from env file
 		env.DotenvDelete(environment.AksClusterEnvVarName)
 
-		serviceTarget := createAksServiceTarget(mockContext, serviceConfig, env)
+		serviceTarget := createAksServiceTarget(mockContext, serviceConfig, env, nil)
 		err = simulateInitliaze(*mockContext.Context, serviceTarget, serviceConfig)
 		require.NoError(t, err)
 	})