diff --git a/pkg/artifactory/provider/framework.go b/pkg/artifactory/provider/framework.go
index b84e1333..be6440f8 100644
--- a/pkg/artifactory/provider/framework.go
+++ b/pkg/artifactory/provider/framework.go
@@ -20,6 +20,7 @@ import (
 	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/artifactory/resource/configuration"
 	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/artifactory/resource/lifecycle"
 	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/artifactory/resource/replication"
+	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/artifactory/resource/repository"
 	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/artifactory/resource/repository/local"
 	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/artifactory/resource/security"
 	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/artifactory/resource/user"
@@ -205,6 +206,7 @@ func (p *ArtifactoryProvider) Configure(ctx context.Context, req provider.Config
 
 // Resources satisfies the provider.Provider interface for ArtifactoryProvider.
 func (p *ArtifactoryProvider) Resources(ctx context.Context) []func() resource.Resource {
+	resources := []func() resource.Resource{}
 
 	localGenericLikeRepositoryResources := lo.Map(
 		local.PackageTypesLikeGeneric,
@@ -212,9 +214,19 @@ func (p *ArtifactoryProvider) Resources(ctx context.Context) []func() resource.R
 			return local.NewGenericLocalRepositoryResource(packageType)
 		},
 	)
+	resources = append(resources, localGenericLikeRepositoryResources...)
+
+	localGradleLikeRepositoryResources := lo.Map(
+		repository.PackageTypesLikeGradle,
+		func(packageType string, _ int) func() resource.Resource {
+			return local.NewJavaLocalRepositoryResource(packageType, true)
+		},
+	)
+	resources = append(resources, localGradleLikeRepositoryResources...)
+	resources = append(resources, local.NewJavaLocalRepositoryResource(repository.MavenPackageType, false))
 
 	return append(
-		localGenericLikeRepositoryResources,
+		resources,
 		[]func() resource.Resource{
 			artifact.NewArtifactResource,
 			artifact.NewItemPropertiesResource,
@@ -253,7 +265,13 @@ func (p *ArtifactoryProvider) Resources(ctx context.Context) []func() resource.R
 			local.NewDebianLocalRepositoryResource,
 			local.NewDockerV2LocalRepositoryResource,
 			local.NewDockerV1LocalRepositoryResource,
+			local.NewHelmOCILocalRepositoryResource,
 			local.NewMachineLearningLocalRepositoryResource,
+			local.NewNugetLocalRepositoryResource,
+			local.NewOCILocalRepositoryResource,
+			local.NewRPMLocalRepositoryResource,
+			local.NewTerraformModuleLocalRepositoryResource,
+			local.NewTerraformProviderLocalRepositoryResource,
 			webhook.NewArtifactWebhookResource,
 			webhook.NewArtifactCustomWebhookResource,
 			webhook.NewArtifactLifecycleWebhookResource,
diff --git a/pkg/artifactory/provider/resources.go b/pkg/artifactory/provider/resources.go
index 5dcc1f09..92948e27 100644
--- a/pkg/artifactory/provider/resources.go
+++ b/pkg/artifactory/provider/resources.go
@@ -8,7 +8,6 @@ import (
 	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/artifactory/resource/replication"
 	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/artifactory/resource/repository"
 	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/artifactory/resource/repository/federated"
-	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/artifactory/resource/repository/local"
 	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/artifactory/resource/repository/remote"
 	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/artifactory/resource/repository/virtual"
 	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/artifactory/resource/security"
@@ -32,13 +31,6 @@ func resourcesMap() map[string]*schema.Resource {
 		"artifactory_federated_rpm_repository":                federated.ResourceArtifactoryFederatedRpmRepository(),
 		"artifactory_federated_terraform_module_repository":   federated.ResourceArtifactoryFederatedTerraformRepository("module"),
 		"artifactory_federated_terraform_provider_repository": federated.ResourceArtifactoryFederatedTerraformRepository("provider"),
-		"artifactory_local_helmoci_repository":                local.ResourceArtifactoryLocalHelmOciRepository(),
-		"artifactory_local_maven_repository":                  local.ResourceArtifactoryLocalJavaRepository(repository.MavenPackageType, false),
-		"artifactory_local_nuget_repository":                  local.ResourceArtifactoryLocalNugetRepository(),
-		"artifactory_local_oci_repository":                    local.ResourceArtifactoryLocalOciRepository(),
-		"artifactory_local_rpm_repository":                    local.ResourceArtifactoryLocalRpmRepository(),
-		"artifactory_local_terraform_module_repository":       local.ResourceArtifactoryLocalTerraformRepository("module"),
-		"artifactory_local_terraform_provider_repository":     local.ResourceArtifactoryLocalTerraformRepository("provider"),
 		"artifactory_remote_ansible_repository":               remote.ResourceArtifactoryRemoteAnsibleRepository(),
 		"artifactory_remote_bower_repository":                 remote.ResourceArtifactoryRemoteBowerRepository(),
 		"artifactory_remote_cargo_repository":                 remote.ResourceArtifactoryRemoteCargoRepository(),
@@ -91,8 +83,6 @@ func resourcesMap() map[string]*schema.Resource {
 	}
 
 	for _, packageType := range repository.PackageTypesLikeGradle {
-		localResourceName := fmt.Sprintf("artifactory_local_%s_repository", packageType)
-		resourcesMap[localResourceName] = local.ResourceArtifactoryLocalJavaRepository(packageType, true)
 		virtualResourceName := fmt.Sprintf("artifactory_virtual_%s_repository", packageType)
 		resourcesMap[virtualResourceName] = virtual.ResourceArtifactoryVirtualJavaRepository(packageType)
 		federatedResourceName := fmt.Sprintf("artifactory_federated_%s_repository", packageType)
diff --git a/pkg/artifactory/resource/repository/federated/resource_artifactory_federated_helmoci_repository.go b/pkg/artifactory/resource/repository/federated/resource_artifactory_federated_helmoci_repository.go
index 25ea0fd4..acfc4f82 100644
--- a/pkg/artifactory/resource/repository/federated/resource_artifactory_federated_helmoci_repository.go
+++ b/pkg/artifactory/resource/repository/federated/resource_artifactory_federated_helmoci_repository.go
@@ -6,6 +6,7 @@ import (
 	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/artifactory/resource/repository/local"
 	"github.com/jfrog/terraform-provider-shared/packer"
 	"github.com/jfrog/terraform-provider-shared/predicate"
+	utilsdk "github.com/jfrog/terraform-provider-shared/util/sdk"
 	"github.com/samber/lo"
 )
 
@@ -15,6 +16,15 @@ type HelmOciFederatedRepositoryParams struct {
 	RepoParams
 }
 
+func unpackLocalHelmOciRepository(data *schema.ResourceData, Rclass string) local.HelmOciLocalRepositoryParams {
+	d := &utilsdk.ResourceData{ResourceData: data}
+	return local.HelmOciLocalRepositoryParams{
+		RepositoryBaseParams: local.UnpackBaseRepo(Rclass, data, repository.HelmOCIPackageType),
+		MaxUniqueTags:        d.GetInt("max_unique_tags", false),
+		TagRetention:         d.GetInt("tag_retention", false),
+	}
+}
+
 func ResourceArtifactoryFederatedHelmOciRepository() *schema.Resource {
 	helmociSchema := lo.Assign(
 		local.HelmOCISchemas[local.CurrentSchemaVersion],
@@ -24,7 +34,7 @@ func ResourceArtifactoryFederatedHelmOciRepository() *schema.Resource {
 
 	var unpackRepository = func(data *schema.ResourceData) (interface{}, string, error) {
 		repo := HelmOciFederatedRepositoryParams{
-			HelmOciLocalRepositoryParams: local.UnpackLocalHelmOciRepository(data, Rclass),
+			HelmOciLocalRepositoryParams: unpackLocalHelmOciRepository(data, Rclass),
 			Members:                      unpackMembers(data),
 			RepoParams:                   unpackRepoParams(data),
 		}
diff --git a/pkg/artifactory/resource/repository/federated/resource_artifactory_federated_java_repository.go b/pkg/artifactory/resource/repository/federated/resource_artifactory_federated_java_repository.go
index eef631aa..a41a5240 100644
--- a/pkg/artifactory/resource/repository/federated/resource_artifactory_federated_java_repository.go
+++ b/pkg/artifactory/resource/repository/federated/resource_artifactory_federated_java_repository.go
@@ -6,6 +6,7 @@ import (
 	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/artifactory/resource/repository/local"
 	"github.com/jfrog/terraform-provider-shared/packer"
 	"github.com/jfrog/terraform-provider-shared/predicate"
+	utilsdk "github.com/jfrog/terraform-provider-shared/util/sdk"
 	"github.com/samber/lo"
 )
 
@@ -15,6 +16,19 @@ type JavaFederatedRepositoryParams struct {
 	RepoParams
 }
 
+var unpackLocalJavaRepository = func(data *schema.ResourceData, Rclass string, packageType string) local.JavaLocalRepositoryParams {
+	d := &utilsdk.ResourceData{ResourceData: data}
+	return local.JavaLocalRepositoryParams{
+		RepositoryBaseParams:         local.UnpackBaseRepo(Rclass, data, packageType),
+		ChecksumPolicyType:           d.GetString("checksum_policy_type", false),
+		SnapshotVersionBehavior:      d.GetString("snapshot_version_behavior", false),
+		MaxUniqueSnapshots:           d.GetInt("max_unique_snapshots", false),
+		HandleReleases:               d.GetBool("handle_releases", false),
+		HandleSnapshots:              d.GetBool("handle_snapshots", false),
+		SuppressPomConsistencyChecks: d.GetBool("suppress_pom_consistency_checks", false),
+	}
+}
+
 func ResourceArtifactoryFederatedJavaRepository(packageType string, suppressPom bool) *schema.Resource {
 
 	javaFederatedSchema := lo.Assign(
@@ -25,7 +39,7 @@ func ResourceArtifactoryFederatedJavaRepository(packageType string, suppressPom
 
 	var unpackFederatedJavaRepository = func(data *schema.ResourceData) (interface{}, string, error) {
 		repo := JavaFederatedRepositoryParams{
-			JavaLocalRepositoryParams: local.UnpackLocalJavaRepository(data, Rclass, packageType),
+			JavaLocalRepositoryParams: unpackLocalJavaRepository(data, Rclass, packageType),
 			Members:                   unpackMembers(data),
 			RepoParams:                unpackRepoParams(data),
 		}
diff --git a/pkg/artifactory/resource/repository/federated/resource_artifactory_federated_nuget_repository.go b/pkg/artifactory/resource/repository/federated/resource_artifactory_federated_nuget_repository.go
index 73f4c0c3..0b5a69d3 100644
--- a/pkg/artifactory/resource/repository/federated/resource_artifactory_federated_nuget_repository.go
+++ b/pkg/artifactory/resource/repository/federated/resource_artifactory_federated_nuget_repository.go
@@ -6,6 +6,7 @@ import (
 	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/artifactory/resource/repository/local"
 	"github.com/jfrog/terraform-provider-shared/packer"
 	"github.com/jfrog/terraform-provider-shared/predicate"
+	utilsdk "github.com/jfrog/terraform-provider-shared/util/sdk"
 	"github.com/samber/lo"
 )
 
@@ -15,6 +16,15 @@ type NugetFederatedRepositoryParams struct {
 	RepoParams
 }
 
+func unpackLocalNugetRepository(data *schema.ResourceData, Rclass string) local.NugetLocalRepositoryParams {
+	d := &utilsdk.ResourceData{ResourceData: data}
+	return local.NugetLocalRepositoryParams{
+		RepositoryBaseParams:     local.UnpackBaseRepo(Rclass, data, repository.NugetPackageType),
+		MaxUniqueSnapshots:       d.GetInt("max_unique_snapshots", false),
+		ForceNugetAuthentication: d.GetBool("force_nuget_authentication", false),
+	}
+}
+
 func ResourceArtifactoryFederatedNugetRepository() *schema.Resource {
 	nugetFederatedSchema := lo.Assign(
 		local.NugetSchemas[local.CurrentSchemaVersion],
@@ -24,7 +34,7 @@ func ResourceArtifactoryFederatedNugetRepository() *schema.Resource {
 
 	var unpackFederatedNugetRepository = func(data *schema.ResourceData) (interface{}, string, error) {
 		repo := NugetFederatedRepositoryParams{
-			NugetLocalRepositoryParams: local.UnpackLocalNugetRepository(data, Rclass),
+			NugetLocalRepositoryParams: unpackLocalNugetRepository(data, Rclass),
 			Members:                    unpackMembers(data),
 			RepoParams:                 unpackRepoParams(data),
 		}
diff --git a/pkg/artifactory/resource/repository/federated/resource_artifactory_federated_oci_repository.go b/pkg/artifactory/resource/repository/federated/resource_artifactory_federated_oci_repository.go
index 1f8329bc..132800db 100644
--- a/pkg/artifactory/resource/repository/federated/resource_artifactory_federated_oci_repository.go
+++ b/pkg/artifactory/resource/repository/federated/resource_artifactory_federated_oci_repository.go
@@ -6,6 +6,7 @@ import (
 	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/artifactory/resource/repository/local"
 	"github.com/jfrog/terraform-provider-shared/packer"
 	"github.com/jfrog/terraform-provider-shared/predicate"
+	utilsdk "github.com/jfrog/terraform-provider-shared/util/sdk"
 	"github.com/samber/lo"
 )
 
@@ -15,6 +16,16 @@ type OciFederatedRepositoryParams struct {
 	RepoParams
 }
 
+func unpackLocalOciRepository(data *schema.ResourceData, Rclass string) local.OciLocalRepositoryParams {
+	d := &utilsdk.ResourceData{ResourceData: data}
+	return local.OciLocalRepositoryParams{
+		RepositoryBaseParams: local.UnpackBaseRepo(Rclass, data, repository.OCIPackageType),
+		MaxUniqueTags:        d.GetInt("max_unique_tags", false),
+		DockerApiVersion:     "V2",
+		TagRetention:         d.GetInt("tag_retention", false),
+	}
+}
+
 func ResourceArtifactoryFederatedOciRepository() *schema.Resource {
 	ociFederatedSchema := lo.Assign(
 		local.OCILocalSchemas[local.CurrentSchemaVersion],
@@ -24,7 +35,7 @@ func ResourceArtifactoryFederatedOciRepository() *schema.Resource {
 
 	var unpackFederatedOciRepository = func(data *schema.ResourceData) (interface{}, string, error) {
 		repo := OciFederatedRepositoryParams{
-			OciLocalRepositoryParams: local.UnpackLocalOciRepository(data, Rclass),
+			OciLocalRepositoryParams: unpackLocalOciRepository(data, Rclass),
 			Members:                  unpackMembers(data),
 			RepoParams:               unpackRepoParams(data),
 		}
diff --git a/pkg/artifactory/resource/repository/federated/resource_artifactory_federated_rpm_repository.go b/pkg/artifactory/resource/repository/federated/resource_artifactory_federated_rpm_repository.go
index 5379edaa..7a8dc1fe 100644
--- a/pkg/artifactory/resource/repository/federated/resource_artifactory_federated_rpm_repository.go
+++ b/pkg/artifactory/resource/repository/federated/resource_artifactory_federated_rpm_repository.go
@@ -6,6 +6,7 @@ import (
 	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/artifactory/resource/repository/local"
 	"github.com/jfrog/terraform-provider-shared/packer"
 	"github.com/jfrog/terraform-provider-shared/predicate"
+	utilsdk "github.com/jfrog/terraform-provider-shared/util/sdk"
 	"github.com/samber/lo"
 )
 
@@ -15,6 +16,23 @@ type RpmFederatedRepositoryParams struct {
 	RepoParams
 }
 
+func unpackLocalRpmRepository(data *schema.ResourceData, Rclass string) local.RpmLocalRepositoryParams {
+	d := &utilsdk.ResourceData{ResourceData: data}
+	return local.RpmLocalRepositoryParams{
+		RepositoryBaseParams: local.UnpackBaseRepo(Rclass, data, repository.RPMPackageType),
+		PrimaryKeyPairRefParam: repository.PrimaryKeyPairRefParam{
+			PrimaryKeyPairRefSDKv2: d.GetString("primary_keypair_ref", false),
+		},
+		SecondaryKeyPairRefParam: repository.SecondaryKeyPairRefParam{
+			SecondaryKeyPairRefSDKv2: d.GetString("secondary_keypair_ref", false),
+		},
+		RootDepth:               d.GetInt("yum_root_depth", false),
+		CalculateYumMetadata:    d.GetBool("calculate_yum_metadata", false),
+		EnableFileListsIndexing: d.GetBool("enable_file_lists_indexing", false),
+		GroupFileNames:          d.GetString("yum_group_file_names", false),
+	}
+}
+
 func ResourceArtifactoryFederatedRpmRepository() *schema.Resource {
 	rpmFederatedSchema := lo.Assign(
 		local.RPMSchemas[local.CurrentSchemaVersion],
@@ -24,7 +42,7 @@ func ResourceArtifactoryFederatedRpmRepository() *schema.Resource {
 
 	var unpackFederatedRpmRepository = func(data *schema.ResourceData) (interface{}, string, error) {
 		repo := RpmFederatedRepositoryParams{
-			RpmLocalRepositoryParams: local.UnpackLocalRpmRepository(data, Rclass),
+			RpmLocalRepositoryParams: unpackLocalRpmRepository(data, Rclass),
 			Members:                  unpackMembers(data),
 			RepoParams:               unpackRepoParams(data),
 		}
diff --git a/pkg/artifactory/resource/repository/federated/resource_artifactory_federated_terraform_repository.go b/pkg/artifactory/resource/repository/federated/resource_artifactory_federated_terraform_repository.go
index 1f5ce3bf..0764db62 100644
--- a/pkg/artifactory/resource/repository/federated/resource_artifactory_federated_terraform_repository.go
+++ b/pkg/artifactory/resource/repository/federated/resource_artifactory_federated_terraform_repository.go
@@ -15,6 +15,13 @@ type TerraformFederatedRepositoryParams struct {
 	RepoParams
 }
 
+func unpackLocalTerraformRepository(data *schema.ResourceData, Rclass string, registryType string) local.RepositoryBaseParams {
+	repo := local.UnpackBaseRepo(Rclass, data, "terraform_"+registryType)
+	repo.TerraformType = registryType
+
+	return repo
+}
+
 func ResourceArtifactoryFederatedTerraformRepository(registryType string) *schema.Resource {
 	packageType := "terraform_" + registryType
 
@@ -26,7 +33,7 @@ func ResourceArtifactoryFederatedTerraformRepository(registryType string) *schem
 
 	var unpackFederatedTerraformRepository = func(data *schema.ResourceData) (interface{}, string, error) {
 		repo := TerraformFederatedRepositoryParams{
-			RepositoryBaseParams: local.UnpackLocalTerraformRepository(data, Rclass, registryType),
+			RepositoryBaseParams: unpackLocalTerraformRepository(data, Rclass, registryType),
 			Members:              unpackMembers(data),
 			RepoParams:           unpackRepoParams(data),
 		}
diff --git a/pkg/artifactory/resource/repository/local/local.go b/pkg/artifactory/resource/repository/local/local.go
index 31c1ad93..88225b4f 100644
--- a/pkg/artifactory/resource/repository/local/local.go
+++ b/pkg/artifactory/resource/repository/local/local.go
@@ -25,7 +25,7 @@ const (
 	CurrentSchemaVersion = 1
 )
 
-func NewLocalRepositoryResource(packageType string, resourceModelType, apiModelType reflect.Type) localResource {
+func NewLocalRepositoryResource(packageType, packageName string, resourceModelType, apiModelType reflect.Type) localResource {
 	return localResource{
 		BaseResource: repository.BaseResource{
 			JFrogResource: util.JFrogResource{
@@ -33,7 +33,7 @@ func NewLocalRepositoryResource(packageType string, resourceModelType, apiModelT
 				CollectionEndpoint: "artifactory/api/repositories",
 				DocumentEndpoint:   "artifactory/api/repositories/{key}",
 			},
-			Description:       fmt.Sprintf("Provides a resource to creates a %s repository.", packageType),
+			Description:       fmt.Sprintf("Provides a resource to creates a %s repository.", packageName),
 			PackageType:       packageType,
 			Rclass:            Rclass,
 			ResourceModelType: resourceModelType,
diff --git a/pkg/artifactory/resource/repository/local/resource_artifactory_local_alpine_repository.go b/pkg/artifactory/resource/repository/local/resource_artifactory_local_alpine_repository.go
index b8f35f8b..81efcf17 100644
--- a/pkg/artifactory/resource/repository/local/resource_artifactory_local_alpine_repository.go
+++ b/pkg/artifactory/resource/repository/local/resource_artifactory_local_alpine_repository.go
@@ -15,7 +15,12 @@ import (
 
 func NewAlpineLocalRepositoryResource() resource.Resource {
 	return &localAlpineResource{
-		localResource: NewLocalRepositoryResource(repository.AlpinePackageType, reflect.TypeFor[LocalAlpineResourceModel](), reflect.TypeFor[LocalAlpineAPIModel]()),
+		localResource: NewLocalRepositoryResource(
+			repository.AlpinePackageType,
+			"Alpine",
+			reflect.TypeFor[LocalAlpineResourceModel](),
+			reflect.TypeFor[LocalAlpineAPIModel](),
+		),
 	}
 }
 
diff --git a/pkg/artifactory/resource/repository/local/resource_artifactory_local_alpine_repository_test.go b/pkg/artifactory/resource/repository/local/resource_artifactory_local_alpine_repository_test.go
index 8c735514..24616b63 100644
--- a/pkg/artifactory/resource/repository/local/resource_artifactory_local_alpine_repository_test.go
+++ b/pkg/artifactory/resource/repository/local/resource_artifactory_local_alpine_repository_test.go
@@ -4,6 +4,7 @@ import (
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/plancheck"
 	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/acctest"
 	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/artifactory/resource/repository"
 	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/artifactory/resource/security"
@@ -105,3 +106,98 @@ EOF
 		},
 	})
 }
+
+func TestAccLocalAlpineRepository_UpgradeFromSDKv2(t *testing.T) {
+	_, fqrn, name := testutil.MkNames("alpine-local-test-repo", "artifactory_local_alpine_repository")
+	kpId, _, kpName := testutil.MkNames("some-keypair", "artifactory_keypair")
+
+	config := util.ExecuteTemplate("keypair", `
+		resource "artifactory_keypair" "{{ .kp_name }}" {
+			pair_name  = "{{ .kp_name }}"
+			pair_type = "RSA"
+			alias = "foo-alias{{ .kp_id }}"
+			private_key = <<EOF
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEA2ymVc24BoaZb0ElXoI3X4zUKJGZEetR6F4yT1tJhkPDg7UTm
+iNoFB5TZJvP6LBrrSwszkpZbxaVOkBrwrGbqFUaXPgud8VabfHl0imXvN746zmpj
+YEMGqJzm+Gh6aBWOlnPdLuHhds/kcanFAEppj5yN0tVWDnqjOJjR7EpxMSdP3TSd
+6tNAY73LGNLNJQc6tSxh8nMIb4HhSWQSgfof+FwcLGvs+mmyBq8Jz5Zy4BSCk1fQ
+FmCnSGyzpyBD0vMd6eLHk2l0tm56DrlonbDMX8KGs7e9ZgjANkT5PnipLOaeLJU4
+H+OWyBZUAT4hl/iRVvLwV81x7g0/O38kmPYJDQIDAQABAoIBAFb7wyhEIfuhhlE9
+uryrb2LrGzJlMIq7qBWOouKhLz4SjIM/VGw+c76VkjZGoSU+LeLj+D0W1ie0u2Cw
+gJM8aW22TbK/c5lksWOO5PVFDdPG+ZoRWY3MLGlhlL5E4UhMPgJyy/eeiRjZ3CZM
+pja+UfVAwn1KVNR8UinVZYPt680AvEd1FGxoNLxemIPNug46nNqp6Al86Bn+BnkN
+GXpwyooXVSfo4k+pnFBFIXUdA1dUEXQSVb1AxlTo6g/Ok/+8Gfq8idCdu+5fcZI2
+1eLeC+FAa92rr1SFX/UWeB4cMyuAqwuxbFFIplT22SaUSsNuOUSH4E00nbP/AuCb
+1BqrLmECgYEA7tQKfyF9aiXTsOMdOnSAa5OyEaCfsFtcmLd4ykVrwN8O36NoX005
+VbGuqo87fwIXQIKHU+kOEs/TmaQ8bNcbCD/SfWGTtOnHG4qfIsepJuoMwbQHRhGF
+JeoXh5yEUKg5pcDBY8PENEtEVKmFuL4bPOdn+9FNLGsjftvXpmGWbGUCgYEA6uuQ
+7kzO6WD88OsxdJzlJM11hg2SaSBCh3+5tnOhF1ULOUt4tdYXzh3QI6BPX7tkArYf
+XteVfWoWqn6T7LtCjFm350BqVpPhqfLKnt6fYf1yotsj/cyZXlXquRbxbgakB0n0
+4PrsZaube0TPPVeirzNyOVHyFc+iW+F+IUYD+4kCgYEApDEjBkP/9PoMj4+UiJuP
+rmXcBkJnhtdI0bVRVb5kVjUEBLxTBTISONfvPVM7lBXb5n3Wi9mt00EOOJKw+CLq
+csFt9MUgxz/xov2qaj7aC+bc3k7msUVaRLardpAkZ09AUrQyQGRWf50/XPUu+dO4
+5iYxVu6OH/uIa664k6qDwAECgYEAslS8oomgEL3VhbWkx1dLA5MMggTPfgpFNsMY
+4Y4JXcLrUEUgjzjEvW0YUdMiLhP8qapDSiXxj1D3f9myxWSp8g0xc9UMZEjCZ9at
+RcjNyP8zBLnCKqokSt6B3puyDsnvvrC/ugIBbnTFBOCJSZG7J7CwJx8z3KbQI1ub
++fpCj7ECgYAd69soLEybUGMjsdI+OijIGoUTUoZGXJm+0VpBt4QJCe7AMnYPfYzA
+JnEmN4D7HLTKUBklQnb/FhP/RuiT2bSAd1l+PNeuU7gYROCBBonzxXQ1wEbNrSYA
+iyoc9g/kvV8HTW8361xEhu7wmuSEEx1gQ/7sdhTkgrTncc8hxVRxuA==
+-----END RSA PRIVATE KEY-----
+EOF
+			public_key = <<EOF
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2ymVc24BoaZb0ElXoI3X
+4zUKJGZEetR6F4yT1tJhkPDg7UTmiNoFB5TZJvP6LBrrSwszkpZbxaVOkBrwrGbq
+FUaXPgud8VabfHl0imXvN746zmpjYEMGqJzm+Gh6aBWOlnPdLuHhds/kcanFAEpp
+j5yN0tVWDnqjOJjR7EpxMSdP3TSd6tNAY73LGNLNJQc6tSxh8nMIb4HhSWQSgfof
++FwcLGvs+mmyBq8Jz5Zy4BSCk1fQFmCnSGyzpyBD0vMd6eLHk2l0tm56DrlonbDM
+X8KGs7e9ZgjANkT5PnipLOaeLJU4H+OWyBZUAT4hl/iRVvLwV81x7g0/O38kmPYJ
+DQIDAQAB
+-----END PUBLIC KEY-----
+EOF
+			lifecycle {
+				ignore_changes = [
+					private_key,
+					passphrase,
+				]
+			}
+		}
+
+		resource "artifactory_local_alpine_repository" "{{ .repo_name }}" {
+			key = "{{ .repo_name }}"
+			primary_keypair_ref = artifactory_keypair.{{ .kp_name }}.pair_name
+		}
+	`, map[string]interface{}{
+		"kp_id":     kpId,
+		"kp_name":   kpName,
+		"repo_name": name,
+	}) // we use randomness so that, in the case of failure and dangle, the next test can run without collision
+
+	resource.Test(t, resource.TestCase{
+		Steps: []resource.TestStep{
+			{
+				ExternalProviders: map[string]resource.ExternalProvider{
+					"artifactory": {
+						VersionConstraint: "12.8.0",
+						Source:            "jfrog/artifactory",
+					},
+				},
+				Config: config,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(fqrn, "id", name),
+					resource.TestCheckResourceAttr(fqrn, "key", name),
+				),
+			},
+			{
+				ProtoV6ProviderFactories: acctest.ProtoV6ProviderFactories,
+				Config:                   config,
+				ConfigPlanChecks: resource.ConfigPlanChecks{
+					PreApply: []plancheck.PlanCheck{
+						plancheck.ExpectEmptyPlan(),
+					},
+				},
+			},
+		},
+	})
+}
diff --git a/pkg/artifactory/resource/repository/local/resource_artifactory_local_ansible_repository.go b/pkg/artifactory/resource/repository/local/resource_artifactory_local_ansible_repository.go
index 9a7f1265..7b76fd99 100644
--- a/pkg/artifactory/resource/repository/local/resource_artifactory_local_ansible_repository.go
+++ b/pkg/artifactory/resource/repository/local/resource_artifactory_local_ansible_repository.go
@@ -14,7 +14,12 @@ import (
 
 func NewAnsibleLocalRepositoryResource() resource.Resource {
 	return &localAnsibleResource{
-		localResource: NewLocalRepositoryResource(repository.AnsiblePackageType, reflect.TypeFor[LocalAnsibleResourceModel](), reflect.TypeFor[LocalAnsibleAPIModel]()),
+		localResource: NewLocalRepositoryResource(
+			repository.AnsiblePackageType,
+			"Ansible",
+			reflect.TypeFor[LocalAnsibleResourceModel](),
+			reflect.TypeFor[LocalAnsibleAPIModel](),
+		),
 	}
 }
 
diff --git a/pkg/artifactory/resource/repository/local/resource_artifactory_local_ansible_repository_test.go b/pkg/artifactory/resource/repository/local/resource_artifactory_local_ansible_repository_test.go
index 76a25339..bc81d9b9 100644
--- a/pkg/artifactory/resource/repository/local/resource_artifactory_local_ansible_repository_test.go
+++ b/pkg/artifactory/resource/repository/local/resource_artifactory_local_ansible_repository_test.go
@@ -4,6 +4,7 @@ import (
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/plancheck"
 	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/acctest"
 	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/artifactory/resource/repository"
 	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/artifactory/resource/security"
@@ -105,3 +106,98 @@ EOF
 		},
 	})
 }
+
+func TestAccLocalAnsibleRepository_UpgradeFromSDKv2(t *testing.T) {
+	_, fqrn, name := testutil.MkNames("ansible-local-test-repo", "artifactory_local_ansible_repository")
+	kpId, _, kpName := testutil.MkNames("some-keypair", "artifactory_keypair")
+
+	config := util.ExecuteTemplate("keypair", `
+		resource "artifactory_keypair" "{{ .kp_name }}" {
+			pair_name  = "{{ .kp_name }}"
+			pair_type = "RSA"
+			alias = "foo-alias{{ .kp_id }}"
+			private_key = <<EOF
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEA2ymVc24BoaZb0ElXoI3X4zUKJGZEetR6F4yT1tJhkPDg7UTm
+iNoFB5TZJvP6LBrrSwszkpZbxaVOkBrwrGbqFUaXPgud8VabfHl0imXvN746zmpj
+YEMGqJzm+Gh6aBWOlnPdLuHhds/kcanFAEppj5yN0tVWDnqjOJjR7EpxMSdP3TSd
+6tNAY73LGNLNJQc6tSxh8nMIb4HhSWQSgfof+FwcLGvs+mmyBq8Jz5Zy4BSCk1fQ
+FmCnSGyzpyBD0vMd6eLHk2l0tm56DrlonbDMX8KGs7e9ZgjANkT5PnipLOaeLJU4
+H+OWyBZUAT4hl/iRVvLwV81x7g0/O38kmPYJDQIDAQABAoIBAFb7wyhEIfuhhlE9
+uryrb2LrGzJlMIq7qBWOouKhLz4SjIM/VGw+c76VkjZGoSU+LeLj+D0W1ie0u2Cw
+gJM8aW22TbK/c5lksWOO5PVFDdPG+ZoRWY3MLGlhlL5E4UhMPgJyy/eeiRjZ3CZM
+pja+UfVAwn1KVNR8UinVZYPt680AvEd1FGxoNLxemIPNug46nNqp6Al86Bn+BnkN
+GXpwyooXVSfo4k+pnFBFIXUdA1dUEXQSVb1AxlTo6g/Ok/+8Gfq8idCdu+5fcZI2
+1eLeC+FAa92rr1SFX/UWeB4cMyuAqwuxbFFIplT22SaUSsNuOUSH4E00nbP/AuCb
+1BqrLmECgYEA7tQKfyF9aiXTsOMdOnSAa5OyEaCfsFtcmLd4ykVrwN8O36NoX005
+VbGuqo87fwIXQIKHU+kOEs/TmaQ8bNcbCD/SfWGTtOnHG4qfIsepJuoMwbQHRhGF
+JeoXh5yEUKg5pcDBY8PENEtEVKmFuL4bPOdn+9FNLGsjftvXpmGWbGUCgYEA6uuQ
+7kzO6WD88OsxdJzlJM11hg2SaSBCh3+5tnOhF1ULOUt4tdYXzh3QI6BPX7tkArYf
+XteVfWoWqn6T7LtCjFm350BqVpPhqfLKnt6fYf1yotsj/cyZXlXquRbxbgakB0n0
+4PrsZaube0TPPVeirzNyOVHyFc+iW+F+IUYD+4kCgYEApDEjBkP/9PoMj4+UiJuP
+rmXcBkJnhtdI0bVRVb5kVjUEBLxTBTISONfvPVM7lBXb5n3Wi9mt00EOOJKw+CLq
+csFt9MUgxz/xov2qaj7aC+bc3k7msUVaRLardpAkZ09AUrQyQGRWf50/XPUu+dO4
+5iYxVu6OH/uIa664k6qDwAECgYEAslS8oomgEL3VhbWkx1dLA5MMggTPfgpFNsMY
+4Y4JXcLrUEUgjzjEvW0YUdMiLhP8qapDSiXxj1D3f9myxWSp8g0xc9UMZEjCZ9at
+RcjNyP8zBLnCKqokSt6B3puyDsnvvrC/ugIBbnTFBOCJSZG7J7CwJx8z3KbQI1ub
++fpCj7ECgYAd69soLEybUGMjsdI+OijIGoUTUoZGXJm+0VpBt4QJCe7AMnYPfYzA
+JnEmN4D7HLTKUBklQnb/FhP/RuiT2bSAd1l+PNeuU7gYROCBBonzxXQ1wEbNrSYA
+iyoc9g/kvV8HTW8361xEhu7wmuSEEx1gQ/7sdhTkgrTncc8hxVRxuA==
+-----END RSA PRIVATE KEY-----
+EOF
+			public_key = <<EOF
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2ymVc24BoaZb0ElXoI3X
+4zUKJGZEetR6F4yT1tJhkPDg7UTmiNoFB5TZJvP6LBrrSwszkpZbxaVOkBrwrGbq
+FUaXPgud8VabfHl0imXvN746zmpjYEMGqJzm+Gh6aBWOlnPdLuHhds/kcanFAEpp
+j5yN0tVWDnqjOJjR7EpxMSdP3TSd6tNAY73LGNLNJQc6tSxh8nMIb4HhSWQSgfof
++FwcLGvs+mmyBq8Jz5Zy4BSCk1fQFmCnSGyzpyBD0vMd6eLHk2l0tm56DrlonbDM
+X8KGs7e9ZgjANkT5PnipLOaeLJU4H+OWyBZUAT4hl/iRVvLwV81x7g0/O38kmPYJ
+DQIDAQAB
+-----END PUBLIC KEY-----
+EOF
+			lifecycle {
+				ignore_changes = [
+					private_key,
+					passphrase,
+				]
+			}
+		}
+
+		resource "artifactory_local_ansible_repository" "{{ .repo_name }}" {
+			key 	     = "{{ .repo_name }}"
+			primary_keypair_ref = artifactory_keypair.{{ .kp_name }}.pair_name
+		}
+	`, map[string]interface{}{
+		"kp_id":     kpId,
+		"kp_name":   kpName,
+		"repo_name": name,
+	}) // we use randomness so that, in the case of failure and dangle, the next test can run without collision
+
+	resource.Test(t, resource.TestCase{
+		Steps: []resource.TestStep{
+			{
+				ExternalProviders: map[string]resource.ExternalProvider{
+					"artifactory": {
+						VersionConstraint: "12.8.0",
+						Source:            "jfrog/artifactory",
+					},
+				},
+				Config: config,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(fqrn, "id", name),
+					resource.TestCheckResourceAttr(fqrn, "key", name),
+				),
+			},
+			{
+				ProtoV6ProviderFactories: acctest.ProtoV6ProviderFactories,
+				Config:                   config,
+				ConfigPlanChecks: resource.ConfigPlanChecks{
+					PreApply: []plancheck.PlanCheck{
+						plancheck.ExpectEmptyPlan(),
+					},
+				},
+			},
+		},
+	})
+}
diff --git a/pkg/artifactory/resource/repository/local/resource_artifactory_local_cargo_repository.go b/pkg/artifactory/resource/repository/local/resource_artifactory_local_cargo_repository.go
index b3f18a35..5032b300 100644
--- a/pkg/artifactory/resource/repository/local/resource_artifactory_local_cargo_repository.go
+++ b/pkg/artifactory/resource/repository/local/resource_artifactory_local_cargo_repository.go
@@ -16,7 +16,12 @@ import (
 
 func NewCargoLocalRepositoryResource() resource.Resource {
 	return &localCargoResource{
-		localResource: NewLocalRepositoryResource(repository.CargoPackageType, reflect.TypeFor[LocalCargoResourceModel](), reflect.TypeFor[LocalCargoAPIModel]()),
+		localResource: NewLocalRepositoryResource(
+			repository.CargoPackageType,
+			"Cargo",
+			reflect.TypeFor[LocalCargoResourceModel](),
+			reflect.TypeFor[LocalCargoAPIModel](),
+		),
 	}
 }
 
diff --git a/pkg/artifactory/resource/repository/local/resource_artifactory_local_cargo_repository_test.go b/pkg/artifactory/resource/repository/local/resource_artifactory_local_cargo_repository_test.go
index a51fb54c..d32a4809 100644
--- a/pkg/artifactory/resource/repository/local/resource_artifactory_local_cargo_repository_test.go
+++ b/pkg/artifactory/resource/repository/local/resource_artifactory_local_cargo_repository_test.go
@@ -5,6 +5,7 @@ import (
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/plancheck"
 	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/acctest"
 	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/artifactory/resource/repository"
 	"github.com/jfrog/terraform-provider-shared/testutil"
@@ -52,3 +53,46 @@ func TestAccLocalCargoRepository(t *testing.T) {
 		},
 	})
 }
+
+func TestAccLocalCargoRepository_UpgradeFromSDKv2(t *testing.T) {
+	_, fqrn, name := testutil.MkNames("cargo-local", "artifactory_local_cargo_repository")
+	params := map[string]interface{}{
+		"anonymous_access":    testutil.RandBool(),
+		"enable_sparse_index": testutil.RandBool(),
+		"name":                name,
+	}
+	config := util.ExecuteTemplate("TestAccLocalCargoRepository", `
+		resource "artifactory_local_cargo_repository" "{{ .name }}" {
+		  key              = "{{ .name }}"
+		  anonymous_access = {{ .anonymous_access }}
+		  enable_sparse_index = {{ .enable_sparse_index }}
+		}
+	`, params)
+
+	resource.Test(t, resource.TestCase{
+		Steps: []resource.TestStep{
+			{
+				ExternalProviders: map[string]resource.ExternalProvider{
+					"artifactory": {
+						VersionConstraint: "12.8.0",
+						Source:            "jfrog/artifactory",
+					},
+				},
+				Config: config,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(fqrn, "id", name),
+					resource.TestCheckResourceAttr(fqrn, "key", name),
+				),
+			},
+			{
+				ProtoV6ProviderFactories: acctest.ProtoV6ProviderFactories,
+				Config:                   config,
+				ConfigPlanChecks: resource.ConfigPlanChecks{
+					PreApply: []plancheck.PlanCheck{
+						plancheck.ExpectEmptyPlan(),
+					},
+				},
+			},
+		},
+	})
+}
diff --git a/pkg/artifactory/resource/repository/local/resource_artifactory_local_conan_repository.go b/pkg/artifactory/resource/repository/local/resource_artifactory_local_conan_repository.go
index 46af2522..574fab39 100644
--- a/pkg/artifactory/resource/repository/local/resource_artifactory_local_conan_repository.go
+++ b/pkg/artifactory/resource/repository/local/resource_artifactory_local_conan_repository.go
@@ -17,6 +17,7 @@ func NewConanLocalRepositoryResource() resource.Resource {
 	return &localConanResource{
 		localResource: NewLocalRepositoryResource(
 			repository.ConanPackageType,
+			"Conan",
 			reflect.TypeFor[LocalConanResourceModel](),
 			reflect.TypeFor[LocalConanAPIModel](),
 		),
diff --git a/pkg/artifactory/resource/repository/local/resource_artifactory_local_conan_repository_test.go b/pkg/artifactory/resource/repository/local/resource_artifactory_local_conan_repository_test.go
index 79c59aee..9daf6ad1 100644
--- a/pkg/artifactory/resource/repository/local/resource_artifactory_local_conan_repository_test.go
+++ b/pkg/artifactory/resource/repository/local/resource_artifactory_local_conan_repository_test.go
@@ -5,6 +5,7 @@ import (
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/plancheck"
 	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/acctest"
 	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/artifactory/resource/repository"
 	"github.com/jfrog/terraform-provider-shared/testutil"
@@ -49,3 +50,44 @@ func TestAccLocalConanRepository(t *testing.T) {
 		},
 	})
 }
+
+func TestAccLocalConanRepository_UpgradeFromSDKv2(t *testing.T) {
+	_, fqrn, name := testutil.MkNames("conan-local", "artifactory_local_conan_repository")
+	params := map[string]interface{}{
+		"force_conan_authentication": testutil.RandBool(),
+		"name":                       name,
+	}
+	config := util.ExecuteTemplate("TestAccLocalConanRepository", `
+		resource "artifactory_local_conan_repository" "{{ .name }}" {
+		  key                        = "{{ .name }}"
+		  force_conan_authentication = {{ .force_conan_authentication }}
+		}
+	`, params)
+
+	resource.Test(t, resource.TestCase{
+		Steps: []resource.TestStep{
+			{
+				ExternalProviders: map[string]resource.ExternalProvider{
+					"artifactory": {
+						VersionConstraint: "12.8.0",
+						Source:            "jfrog/artifactory",
+					},
+				},
+				Config: config,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(fqrn, "id", name),
+					resource.TestCheckResourceAttr(fqrn, "key", name),
+				),
+			},
+			{
+				ProtoV6ProviderFactories: acctest.ProtoV6ProviderFactories,
+				Config:                   config,
+				ConfigPlanChecks: resource.ConfigPlanChecks{
+					PreApply: []plancheck.PlanCheck{
+						plancheck.ExpectEmptyPlan(),
+					},
+				},
+			},
+		},
+	})
+}
diff --git a/pkg/artifactory/resource/repository/local/resource_artifactory_local_debian_repository.go b/pkg/artifactory/resource/repository/local/resource_artifactory_local_debian_repository.go
index 44576162..2161e89a 100644
--- a/pkg/artifactory/resource/repository/local/resource_artifactory_local_debian_repository.go
+++ b/pkg/artifactory/resource/repository/local/resource_artifactory_local_debian_repository.go
@@ -17,6 +17,7 @@ func NewDebianLocalRepositoryResource() resource.Resource {
 	return &localDebianResource{
 		localResource: NewLocalRepositoryResource(
 			repository.DebianPackageType,
+			"Debian",
 			reflect.TypeFor[LocalDebianResourceModel](),
 			reflect.TypeFor[LocalDebianAPIModel](),
 		),
diff --git a/pkg/artifactory/resource/repository/local/resource_artifactory_local_debian_repository_test.go b/pkg/artifactory/resource/repository/local/resource_artifactory_local_debian_repository_test.go
index 22071217..ad7079a6 100644
--- a/pkg/artifactory/resource/repository/local/resource_artifactory_local_debian_repository_test.go
+++ b/pkg/artifactory/resource/repository/local/resource_artifactory_local_debian_repository_test.go
@@ -4,6 +4,7 @@ import (
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/plancheck"
 	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/acctest"
 	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/artifactory/resource/repository"
 	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/artifactory/resource/security"
@@ -153,3 +154,141 @@ EOF
 		},
 	})
 }
+
+func TestAccLocalDebianRepository_UpgradeFromSDKv2(t *testing.T) {
+	_, fqrn, name := testutil.MkNames("local-debian-repo", "artifactory_local_debian_repository")
+	kpId, _, kpName := testutil.MkNames("some-keypair1", "artifactory_keypair")
+	kpId2, _, kpName2 := testutil.MkNames("some-keypair2", "artifactory_keypair")
+
+	config := util.ExecuteTemplate("keypair", `
+		resource "artifactory_keypair" "{{ .kp_name }}" {
+			pair_name  = "{{ .kp_name }}"
+			pair_type = "GPG"
+			alias = "foo-alias{{ .kp_id }}"
+			private_key = <<EOF
+-----BEGIN PGP PRIVATE KEY BLOCK-----
+lIYEYYU7tRYJKwYBBAHaRw8BAQdAZ8vVdEyrWGssb7cdreG5GDGv6taHX/vWQdDG
+jn7zib/+BwMCFjb4odY28+n0NWj7KZ53BkA0qzzqT9IpIfsW/tLNPTxYEFrDVbcF
+1CuiAgAhyUfBEr9HQaMJBLfIIvo/B3nlWvwWHkiQFuWpsnJ2pj8F8LQqQ2hyaXN0
+aWFuIEJvbmdpb3JubyA8Y2hyaXN0aWFuYkBqZnJvZy5jb20+iJoEExYKAEIWIQSS
+w8jt+9pdVC3Gts7AvzSEkhHbJAUCYYU7tQIbAwUJA8JnAAULCQgHAgMiAgEGFQoJ
+CAsCBBYCAwECHgcCF4AACgkQwL80hJIR2yRQDgD/X1t/hW9+uXdSY59FOClhQw/t
+AzTYjDW+KLKadYJ3RAIBALD53rj7EnrXsSqv9Vqj3mJ7O38eXu50P57tD8ErpHMD
+nIsEYYU7tRIKKwYBBAGXVQEFAQEHQCfT+jXHVkslGAJqVafoeWO8Nwz/oPPzNDJb
+EOASsMRcAwEIB/4HAwK+Wi8OaidLuvQ6yknLUspoRL8KJlQu0JkfLxj6Wl6GrRtf
+MdUBxaGUQX5UzMIqyYstgHKz2kBYvrJijWdOkkRuL82FySSh4yi/97FBikOBiHgE
+GBYKACAWIQSSw8jt+9pdVC3Gts7AvzSEkhHbJAUCYYU7tQIbDAAKCRDAvzSEkhHb
+JNR/AQCQjGWljmP8pYj6ohP8bOwVB4VE5qxjdfWQvBCUA0LFwgEAxLGVeT88pw3+
+x7Cwd7SsuxlIOOCIJssFnUhA9Qsq2wE=
+=qCzy
+-----END PGP PRIVATE KEY BLOCK-----
+EOF
+			public_key = <<EOF
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+mDMEYYU7tRYJKwYBBAHaRw8BAQdAZ8vVdEyrWGssb7cdreG5GDGv6taHX/vWQdDG
+jn7zib+0KkNocmlzdGlhbiBCb25naW9ybm8gPGNocmlzdGlhbmJAamZyb2cuY29t
+PoiaBBMWCgBCFiEEksPI7fvaXVQtxrbOwL80hJIR2yQFAmGFO7UCGwMFCQPCZwAF
+CwkIBwIDIgIBBhUKCQgLAgQWAgMBAh4HAheAAAoJEMC/NISSEdskUA4A/19bf4Vv
+frl3UmOfRTgpYUMP7QM02Iw1viiymnWCd0QCAQCw+d64+xJ617Eqr/Vao95iezt/
+Hl7udD+e7Q/BK6RzA7g4BGGFO7USCisGAQQBl1UBBQEBB0An0/o1x1ZLJRgCalWn
+6HljvDcM/6Dz8zQyWxDgErDEXAMBCAeIeAQYFgoAIBYhBJLDyO372l1ULca2zsC/
+NISSEdskBQJhhTu1AhsMAAoJEMC/NISSEdsk1H8BAJCMZaWOY/yliPqiE/xs7BUH
+hUTmrGN19ZC8EJQDQsXCAQDEsZV5PzynDf7HsLB3tKy7GUg44IgmywWdSED1Cyrb
+AQ==
+=2kMe
+-----END PGP PUBLIC KEY BLOCK-----
+EOF
+			lifecycle {
+				ignore_changes = [
+					private_key,
+					passphrase,
+				]
+			}
+		}
+
+		resource "artifactory_keypair" "{{ .kp_name2 }}" {
+			pair_name  = "{{ .kp_name2 }}"
+			pair_type = "GPG"
+			alias = "foo-alias{{ .kp_id2 }}"
+			private_key = <<EOF
+-----BEGIN PGP PRIVATE KEY BLOCK-----
+lIYEYYU7tRYJKwYBBAHaRw8BAQdAZ8vVdEyrWGssb7cdreG5GDGv6taHX/vWQdDG
+jn7zib/+BwMCFjb4odY28+n0NWj7KZ53BkA0qzzqT9IpIfsW/tLNPTxYEFrDVbcF
+1CuiAgAhyUfBEr9HQaMJBLfIIvo/B3nlWvwWHkiQFuWpsnJ2pj8F8LQqQ2hyaXN0
+aWFuIEJvbmdpb3JubyA8Y2hyaXN0aWFuYkBqZnJvZy5jb20+iJoEExYKAEIWIQSS
+w8jt+9pdVC3Gts7AvzSEkhHbJAUCYYU7tQIbAwUJA8JnAAULCQgHAgMiAgEGFQoJ
+CAsCBBYCAwECHgcCF4AACgkQwL80hJIR2yRQDgD/X1t/hW9+uXdSY59FOClhQw/t
+AzTYjDW+KLKadYJ3RAIBALD53rj7EnrXsSqv9Vqj3mJ7O38eXu50P57tD8ErpHMD
+nIsEYYU7tRIKKwYBBAGXVQEFAQEHQCfT+jXHVkslGAJqVafoeWO8Nwz/oPPzNDJb
+EOASsMRcAwEIB/4HAwK+Wi8OaidLuvQ6yknLUspoRL8KJlQu0JkfLxj6Wl6GrRtf
+MdUBxaGUQX5UzMIqyYstgHKz2kBYvrJijWdOkkRuL82FySSh4yi/97FBikOBiHgE
+GBYKACAWIQSSw8jt+9pdVC3Gts7AvzSEkhHbJAUCYYU7tQIbDAAKCRDAvzSEkhHb
+JNR/AQCQjGWljmP8pYj6ohP8bOwVB4VE5qxjdfWQvBCUA0LFwgEAxLGVeT88pw3+
+x7Cwd7SsuxlIOOCIJssFnUhA9Qsq2wE=
+=qCzy
+-----END PGP PRIVATE KEY BLOCK-----
+EOF
+			public_key = <<EOF
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+mDMEYYU7tRYJKwYBBAHaRw8BAQdAZ8vVdEyrWGssb7cdreG5GDGv6taHX/vWQdDG
+jn7zib+0KkNocmlzdGlhbiBCb25naW9ybm8gPGNocmlzdGlhbmJAamZyb2cuY29t
+PoiaBBMWCgBCFiEEksPI7fvaXVQtxrbOwL80hJIR2yQFAmGFO7UCGwMFCQPCZwAF
+CwkIBwIDIgIBBhUKCQgLAgQWAgMBAh4HAheAAAoJEMC/NISSEdskUA4A/19bf4Vv
+frl3UmOfRTgpYUMP7QM02Iw1viiymnWCd0QCAQCw+d64+xJ617Eqr/Vao95iezt/
+Hl7udD+e7Q/BK6RzA7g4BGGFO7USCisGAQQBl1UBBQEBB0An0/o1x1ZLJRgCalWn
+6HljvDcM/6Dz8zQyWxDgErDEXAMBCAeIeAQYFgoAIBYhBJLDyO372l1ULca2zsC/
+NISSEdskBQJhhTu1AhsMAAoJEMC/NISSEdsk1H8BAJCMZaWOY/yliPqiE/xs7BUH
+hUTmrGN19ZC8EJQDQsXCAQDEsZV5PzynDf7HsLB3tKy7GUg44IgmywWdSED1Cyrb
+AQ==
+=2kMe
+-----END PGP PUBLIC KEY BLOCK-----
+EOF
+			lifecycle {
+				ignore_changes = [
+					private_key,
+					passphrase,
+				]
+			}
+		}
+
+		resource "artifactory_local_debian_repository" "{{ .repo_name }}" {
+			key = "{{ .repo_name }}"
+			primary_keypair_ref = artifactory_keypair.{{ .kp_name }}.pair_name
+			secondary_keypair_ref = artifactory_keypair.{{ .kp_name2 }}.pair_name
+			index_compression_formats = ["bz2","lzma","xz"]
+		}
+	`, map[string]interface{}{
+		"kp_id":     kpId,
+		"kp_name":   kpName,
+		"kp_id2":    kpId2,
+		"kp_name2":  kpName2,
+		"repo_name": name,
+	}) // we use randomness so that, in the case of failure and dangle, the next test can run without collision
+
+	resource.Test(t, resource.TestCase{
+		Steps: []resource.TestStep{
+			{
+				ExternalProviders: map[string]resource.ExternalProvider{
+					"artifactory": {
+						VersionConstraint: "12.8.0",
+						Source:            "jfrog/artifactory",
+					},
+				},
+				Config: config,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(fqrn, "id", name),
+					resource.TestCheckResourceAttr(fqrn, "key", name),
+				),
+			},
+			{
+				ProtoV6ProviderFactories: acctest.ProtoV6ProviderFactories,
+				Config:                   config,
+				ConfigPlanChecks: resource.ConfigPlanChecks{
+					PreApply: []plancheck.PlanCheck{
+						plancheck.ExpectEmptyPlan(),
+					},
+				},
+			},
+		},
+	})
+}
diff --git a/pkg/artifactory/resource/repository/local/resource_artifactory_local_docker_v1_repository.go b/pkg/artifactory/resource/repository/local/resource_artifactory_local_docker_v1_repository.go
index 91df7c5d..b8ba1e3b 100644
--- a/pkg/artifactory/resource/repository/local/resource_artifactory_local_docker_v1_repository.go
+++ b/pkg/artifactory/resource/repository/local/resource_artifactory_local_docker_v1_repository.go
@@ -25,7 +25,7 @@ func NewDockerV1LocalRepositoryResource() resource.Resource {
 					CollectionEndpoint: "artifactory/api/repositories",
 					DocumentEndpoint:   "artifactory/api/repositories/{key}",
 				},
-				Description:       fmt.Sprintf("Provides a resource to creates a %s V1 repository.", repository.DockerPackageType),
+				Description:       "Provides a resource to creates a Docker V1 repository.",
 				PackageType:       repository.DockerPackageType,
 				Rclass:            Rclass,
 				ResourceModelType: reflect.TypeFor[LocalDockerV1ResourceModel](),
diff --git a/pkg/artifactory/resource/repository/local/resource_artifactory_local_docker_v1_repository_test.go b/pkg/artifactory/resource/repository/local/resource_artifactory_local_docker_v1_repository_test.go
index e47c4cb4..710fb520 100644
--- a/pkg/artifactory/resource/repository/local/resource_artifactory_local_docker_v1_repository_test.go
+++ b/pkg/artifactory/resource/repository/local/resource_artifactory_local_docker_v1_repository_test.go
@@ -6,6 +6,7 @@ import (
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/plancheck"
 	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/acctest"
 	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/artifactory/resource/repository"
 	"github.com/jfrog/terraform-provider-shared/testutil"
@@ -23,7 +24,7 @@ func TestAccLocalDockerV1Repository(t *testing.T) {
 	params := map[string]interface{}{
 		"name": name,
 	}
-	localRepositoryBasic := util.ExecuteTemplate("TestAccLocalDockerv2Repository", `
+	localRepositoryBasic := util.ExecuteTemplate("TestAccLocalDockerv1Repository", `
 		resource "artifactory_local_docker_v1_repository" "{{ .name }}" {
 			key = "{{ .name }}"
 		}
@@ -52,3 +53,47 @@ func TestAccLocalDockerV1Repository(t *testing.T) {
 		},
 	})
 }
+
+func TestAccLocalDockerV1Repository_UpgradeFromSDKv2(t *testing.T) {
+	jfrogURL := os.Getenv("JFROG_URL")
+	if strings.HasSuffix(jfrogURL, "jfrog.io") {
+		t.Skipf("env var JFROG_URL '%s' is a cloud instance.", jfrogURL)
+	}
+
+	_, fqrn, name := testutil.MkNames("dockerv1-local", "artifactory_local_docker_v1_repository")
+	params := map[string]interface{}{
+		"name": name,
+	}
+	config := util.ExecuteTemplate("TestAccLocalDockerv1Repository", `
+		resource "artifactory_local_docker_v1_repository" "{{ .name }}" {
+			key = "{{ .name }}"
+		}
+	`, params)
+
+	resource.Test(t, resource.TestCase{
+		Steps: []resource.TestStep{
+			{
+				ExternalProviders: map[string]resource.ExternalProvider{
+					"artifactory": {
+						VersionConstraint: "12.8.0",
+						Source:            "jfrog/artifactory",
+					},
+				},
+				Config: config,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(fqrn, "id", name),
+					resource.TestCheckResourceAttr(fqrn, "key", name),
+				),
+			},
+			{
+				ProtoV6ProviderFactories: acctest.ProtoV6ProviderFactories,
+				Config:                   config,
+				ConfigPlanChecks: resource.ConfigPlanChecks{
+					PreApply: []plancheck.PlanCheck{
+						plancheck.ExpectEmptyPlan(),
+					},
+				},
+			},
+		},
+	})
+}
diff --git a/pkg/artifactory/resource/repository/local/resource_artifactory_local_docker_v2_repository.go b/pkg/artifactory/resource/repository/local/resource_artifactory_local_docker_v2_repository.go
index 79582069..3e82ec1f 100644
--- a/pkg/artifactory/resource/repository/local/resource_artifactory_local_docker_v2_repository.go
+++ b/pkg/artifactory/resource/repository/local/resource_artifactory_local_docker_v2_repository.go
@@ -29,7 +29,7 @@ func NewDockerV2LocalRepositoryResource() resource.Resource {
 					CollectionEndpoint: "artifactory/api/repositories",
 					DocumentEndpoint:   "artifactory/api/repositories/{key}",
 				},
-				Description:       fmt.Sprintf("Provides a resource to creates a %s V2 repository.", repository.DockerPackageType),
+				Description:       "Provides a resource to creates a Docker V2 repository.",
 				PackageType:       repository.DockerPackageType,
 				Rclass:            Rclass,
 				ResourceModelType: reflect.TypeFor[LocalDockerV2ResourceModel](),
diff --git a/pkg/artifactory/resource/repository/local/resource_artifactory_local_docker_v2_repository_test.go b/pkg/artifactory/resource/repository/local/resource_artifactory_local_docker_v2_repository_test.go
index 4d483251..33481f65 100644
--- a/pkg/artifactory/resource/repository/local/resource_artifactory_local_docker_v2_repository_test.go
+++ b/pkg/artifactory/resource/repository/local/resource_artifactory_local_docker_v2_repository_test.go
@@ -5,6 +5,7 @@ import (
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/plancheck"
 	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/acctest"
 	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/artifactory/resource/repository"
 	"github.com/jfrog/terraform-provider-shared/testutil"
@@ -84,3 +85,48 @@ func TestAccLocalDockerV2RepositoryWithDefaultMaxUniqueTagsGH370(t *testing.T) {
 		},
 	})
 }
+
+func TestAccLocalDockerV2Repository_UpgradeFromSDKv2(t *testing.T) {
+	_, fqrn, name := testutil.MkNames("dockerv2-local", "artifactory_local_docker_v2_repository")
+	params := map[string]interface{}{
+		"block":     testutil.RandBool(),
+		"retention": testutil.RandSelect(1, 5, 10),
+		"max_tags":  testutil.RandSelect(0, 5, 10),
+		"name":      name,
+	}
+	config := util.ExecuteTemplate("TestAccLocalDockerV2Repository", `
+		resource "artifactory_local_docker_v2_repository" "{{ .name }}" {
+			key 	     = "{{ .name }}"
+			tag_retention = {{ .retention }}
+			max_unique_tags = {{ .max_tags }}
+			block_pushing_schema1 = {{ .block }}
+		}
+	`, params)
+
+	resource.Test(t, resource.TestCase{
+		Steps: []resource.TestStep{
+			{
+				ExternalProviders: map[string]resource.ExternalProvider{
+					"artifactory": {
+						VersionConstraint: "12.8.0",
+						Source:            "jfrog/artifactory",
+					},
+				},
+				Config: config,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(fqrn, "id", name),
+					resource.TestCheckResourceAttr(fqrn, "key", name),
+				),
+			},
+			{
+				ProtoV6ProviderFactories: acctest.ProtoV6ProviderFactories,
+				Config:                   config,
+				ConfigPlanChecks: resource.ConfigPlanChecks{
+					PreApply: []plancheck.PlanCheck{
+						plancheck.ExpectEmptyPlan(),
+					},
+				},
+			},
+		},
+	})
+}
diff --git a/pkg/artifactory/resource/repository/local/resource_artifactory_local_generic_repository.go b/pkg/artifactory/resource/repository/local/resource_artifactory_local_generic_repository.go
index 23a178b5..5543bf2e 100644
--- a/pkg/artifactory/resource/repository/local/resource_artifactory_local_generic_repository.go
+++ b/pkg/artifactory/resource/repository/local/resource_artifactory_local_generic_repository.go
@@ -2,7 +2,6 @@ package local
 
 import (
 	"context"
-	"fmt"
 	"reflect"
 
 	"github.com/hashicorp/terraform-plugin-framework/diag"
@@ -12,7 +11,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	sdkv2_schema "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/artifactory/resource/repository"
-	"github.com/jfrog/terraform-provider-shared/util"
 	"github.com/samber/lo"
 )
 
@@ -42,20 +40,12 @@ var PackageTypesLikeGeneric = []string{
 func NewGenericLocalRepositoryResource(packageType string) func() resource.Resource {
 	return func() resource.Resource {
 		return &localGenericResource{
-			localResource: localResource{
-				BaseResource: repository.BaseResource{
-					JFrogResource: util.JFrogResource{
-						TypeName:           fmt.Sprintf("artifactory_local_%s_repository", packageType),
-						CollectionEndpoint: "artifactory/api/repositories",
-						DocumentEndpoint:   "artifactory/api/repositories/{key}",
-					},
-					Description:       "Provides a resource to creates a local Machine Learning repository.",
-					PackageType:       packageType,
-					Rclass:            Rclass,
-					ResourceModelType: reflect.TypeFor[LocalGenericResourceModel](),
-					APIModelType:      reflect.TypeFor[LocalGenericAPIModel](),
-				},
-			},
+			localResource: NewLocalRepositoryResource(
+				packageType,
+				repository.PackageNameLookup[packageType],
+				reflect.TypeFor[LocalGenericResourceModel](),
+				reflect.TypeFor[LocalGenericAPIModel](),
+			),
 		}
 	}
 }
diff --git a/pkg/artifactory/resource/repository/local/resource_artifactory_local_generic_repository_test.go b/pkg/artifactory/resource/repository/local/resource_artifactory_local_generic_repository_test.go
index 91507017..1afe25d4 100644
--- a/pkg/artifactory/resource/repository/local/resource_artifactory_local_generic_repository_test.go
+++ b/pkg/artifactory/resource/repository/local/resource_artifactory_local_generic_repository_test.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"math/rand"
 	"regexp"
+	"strconv"
 	"testing"
 
 	"github.com/go-resty/resty/v2"
@@ -77,7 +78,6 @@ func TestAccLocalGenericRepository_withProjectAttributes(t *testing.T) {
 
 	resource.Test(t, resource.TestCase{
 		PreCheck: func() {
-			acctest.PreCheck(t)
 			acctest.CreateProject(t, projectKey)
 		},
 		ProtoV6ProviderFactories: acctest.ProtoV6ProviderFactories,
@@ -125,7 +125,6 @@ func TestAccLocalGenericRepository_WithInvalidProjectKey(t *testing.T) {
 
 	resource.Test(t, resource.TestCase{
 		PreCheck: func() {
-			acctest.PreCheck(t)
 			acctest.CreateProject(t, projectKey)
 		},
 		ProtoV6ProviderFactories: acctest.ProtoV6ProviderFactories,
@@ -186,7 +185,6 @@ func localGenericLikeTestCase(packageType string, t *testing.T) (*testing.T, res
 	`, params)
 
 	return t, resource.TestCase{
-		PreCheck:                 func() { acctest.PreCheck(t) },
 		ProtoV6ProviderFactories: acctest.ProtoV6ProviderFactories,
 		CheckDestroy:             acctest.VerifyDeleted(t, resourceName, "key", acctest.CheckRepo),
 		Steps: []resource.TestStep{
@@ -258,7 +256,6 @@ func makeLocalRepoTestCaseWithRepoLayoutRef(packageType string, t *testing.T) (*
 	`
 
 	return t, resource.TestCase{
-		PreCheck:                 func() { acctest.PreCheck(t) },
 		ProtoV6ProviderFactories: acctest.ProtoV6ProviderFactories,
 		CheckDestroy:             acctest.VerifyDeleted(t, resourceName, "key", acctest.CheckRepo),
 		Steps: []resource.TestStep{
@@ -290,3 +287,86 @@ func makeLocalRepoTestCaseWithRepoLayoutRef(packageType string, t *testing.T) (*
 		},
 	}
 }
+
+func TestAccLocalHuggingFaceMLRepository(t *testing.T) {
+	_, fqrn, name := testutil.MkNames("huggingfaceml-local", "artifactory_local_huggingfaceml_repository")
+
+	params := map[string]interface{}{
+		"name":                     name,
+		"blacked_out":              testutil.RandBool(),
+		"xray_index":               testutil.RandBool(),
+		"property_set":             "artifactory",
+		"archive_browsing_enabled": testutil.RandBool(),
+	}
+	localRepositoryBasic := util.ExecuteTemplate("TestAccLocalHuggingFaceMLRepository", `
+		resource "artifactory_local_huggingfaceml_repository" "{{ .name }}" {
+		  key                      = "{{ .name }}"
+		  blacked_out              = {{ .blacked_out }}
+		  xray_index               = {{ .xray_index }}
+		  property_sets            = ["{{ .property_set }}"]
+		  archive_browsing_enabled = {{ .archive_browsing_enabled }}
+		}
+	`, params)
+
+	resource.Test(t, resource.TestCase{
+		ProtoV6ProviderFactories: acctest.ProtoV6ProviderFactories,
+		CheckDestroy:             acctest.VerifyDeleted(t, fqrn, "key", acctest.CheckRepo),
+		Steps: []resource.TestStep{
+			{
+				Config: localRepositoryBasic,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(fqrn, "key", name),
+					resource.TestCheckResourceAttr(fqrn, "blacked_out", strconv.FormatBool(params["blacked_out"].(bool))),
+					resource.TestCheckResourceAttr(fqrn, "xray_index", strconv.FormatBool(params["xray_index"].(bool))),
+					resource.TestCheckResourceAttr(fqrn, "property_sets.#", "1"),
+					resource.TestCheckResourceAttr(fqrn, "property_sets.0", params["property_set"].(string)),
+					resource.TestCheckResourceAttr(fqrn, "archive_browsing_enabled", strconv.FormatBool(params["archive_browsing_enabled"].(bool))),
+					resource.TestCheckResourceAttr(fqrn, "repo_layout_ref", func() string {
+						r, _ := repository.GetDefaultRepoLayoutRef("local", "huggingfaceml")
+						return r
+					}()), //Check to ensure repository layout is set as per default even when it is not passed.
+				),
+			},
+			{
+				ResourceName:                         fqrn,
+				ImportState:                          true,
+				ImportStateId:                        name,
+				ImportStateVerify:                    true,
+				ImportStateVerifyIdentifierAttribute: "key",
+			},
+		},
+	})
+}
+
+func TestAccLocalNpmRepository(t *testing.T) {
+	_, fqrn, name := testutil.MkNames("npm-local", "artifactory_local_npm_repository")
+	params := map[string]interface{}{
+		"name": name,
+	}
+	localRepositoryBasic := util.ExecuteTemplate("TestAccLocalNpmRepository", `
+		resource "artifactory_local_npm_repository" "{{ .name }}" {
+		  key                 = "{{ .name }}"
+		}
+	`, params)
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:                 func() { acctest.PreCheck(t) },
+		ProtoV6ProviderFactories: acctest.ProtoV6ProviderFactories,
+		CheckDestroy:             acctest.VerifyDeleted(t, fqrn, "key", acctest.CheckRepo),
+		Steps: []resource.TestStep{
+			{
+				Config: localRepositoryBasic,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(fqrn, "key", name),
+				),
+			},
+			{
+				ResourceName:                         fqrn,
+				ImportState:                          true,
+				ImportStateId:                        name,
+				ImportStateVerify:                    true,
+				ImportStateVerifyIdentifierAttribute: "key",
+			},
+		},
+	})
+}
diff --git a/pkg/artifactory/resource/repository/local/resource_artifactory_local_helmoci_repository.go b/pkg/artifactory/resource/repository/local/resource_artifactory_local_helmoci_repository.go
index d2e3b80c..07b1fd33 100644
--- a/pkg/artifactory/resource/repository/local/resource_artifactory_local_helmoci_repository.go
+++ b/pkg/artifactory/resource/repository/local/resource_artifactory_local_helmoci_repository.go
@@ -1,13 +1,150 @@
 package local
 
 import (
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"context"
+	"reflect"
+
+	"github.com/hashicorp/terraform-plugin-framework-validators/int64validator"
+	"github.com/hashicorp/terraform-plugin-framework/diag"
+	"github.com/hashicorp/terraform-plugin-framework/resource"
+	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
+	"github.com/hashicorp/terraform-plugin-framework/resource/schema/int64default"
+	"github.com/hashicorp/terraform-plugin-framework/schema/validator"
+	"github.com/hashicorp/terraform-plugin-framework/types"
+	sdkv2_schema "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/artifactory/resource/repository"
-	"github.com/jfrog/terraform-provider-shared/packer"
 	utilsdk "github.com/jfrog/terraform-provider-shared/util/sdk"
+	"github.com/samber/lo"
 )
 
+func NewHelmOCILocalRepositoryResource() resource.Resource {
+	return &localHelmOCIResource{
+		localResource: NewLocalRepositoryResource(
+			repository.HelmOCIPackageType,
+			"Helm",
+			reflect.TypeFor[LocalHelmOCIResourceModel](),
+			reflect.TypeFor[LocalHelmOCIAPIModel](),
+		),
+	}
+}
+
+type localHelmOCIResource struct {
+	localResource
+}
+
+type LocalHelmOCIResourceModel struct {
+	LocalResourceModel
+	MaxUniqueTags types.Int64 `tfsdk:"max_unique_tags"`
+	TagRetention  types.Int64 `tfsdk:"tag_retention"`
+}
+
+func (r *LocalHelmOCIResourceModel) GetCreateResourcePlanData(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) {
+	// Read Terraform plan data into the model
+	resp.Diagnostics.Append(req.Plan.Get(ctx, r)...)
+}
+
+func (r LocalHelmOCIResourceModel) SetCreateResourceStateData(ctx context.Context, resp *resource.CreateResponse) {
+	// Save data into Terraform state
+	resp.Diagnostics.Append(resp.State.Set(ctx, &r)...)
+}
+
+func (r *LocalHelmOCIResourceModel) GetReadResourceStateData(ctx context.Context, req resource.ReadRequest, resp *resource.ReadResponse) {
+	// Read Terraform state data into the model
+	resp.Diagnostics.Append(req.State.Get(ctx, r)...)
+}
+
+func (r LocalHelmOCIResourceModel) SetReadResourceStateData(ctx context.Context, resp *resource.ReadResponse) {
+	// Save data into Terraform state
+	resp.Diagnostics.Append(resp.State.Set(ctx, &r)...)
+}
+
+func (r *LocalHelmOCIResourceModel) GetUpdateResourcePlanData(ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse) {
+	// Read Terraform state data into the model
+	resp.Diagnostics.Append(req.Plan.Get(ctx, r)...)
+}
+
+func (r *LocalHelmOCIResourceModel) GetUpdateResourceStateData(ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse) {
+	// Read Terraform state data into the model
+	resp.Diagnostics.Append(req.State.Get(ctx, r)...)
+}
+
+func (r LocalHelmOCIResourceModel) SetUpdateResourceStateData(ctx context.Context, resp *resource.UpdateResponse) {
+	// Save data into Terraform state
+	resp.Diagnostics.Append(resp.State.Set(ctx, &r)...)
+}
+
+func (r LocalHelmOCIResourceModel) ToAPIModel(ctx context.Context, packageType string) (interface{}, diag.Diagnostics) {
+	diags := diag.Diagnostics{}
+
+	model, d := r.LocalResourceModel.ToAPIModel(ctx, packageType)
+	if d != nil {
+		diags.Append(d...)
+	}
+
+	localAPIModel := model.(LocalAPIModel)
+	localAPIModel.RepoLayoutRef = r.RepoLayoutRef.ValueString()
+
+	return LocalHelmOCIAPIModel{
+		LocalAPIModel: localAPIModel,
+		MaxUniqueTags: r.MaxUniqueTags.ValueInt64(),
+		TagRetention:  r.TagRetention.ValueInt64(),
+	}, diags
+}
+
+func (r *LocalHelmOCIResourceModel) FromAPIModel(ctx context.Context, apiModel interface{}) diag.Diagnostics {
+	diags := diag.Diagnostics{}
+
+	model := apiModel.(*LocalHelmOCIAPIModel)
+
+	r.LocalResourceModel.FromAPIModel(ctx, model.LocalAPIModel)
+
+	r.RepoLayoutRef = types.StringValue(model.RepoLayoutRef)
+	r.MaxUniqueTags = types.Int64Value(model.MaxUniqueTags)
+	r.TagRetention = types.Int64Value(model.TagRetention)
+
+	return diags
+}
+
+type LocalHelmOCIAPIModel struct {
+	LocalAPIModel
+	MaxUniqueTags int64 `json:"maxUniqueTags"`
+	TagRetention  int64 `json:"dockerTagRetention"`
+}
+
+func (r *localHelmOCIResource) Schema(ctx context.Context, req resource.SchemaRequest, resp *resource.SchemaResponse) {
+	attributes := lo.Assign(
+		LocalAttributes,
+		repository.RepoLayoutRefAttribute(r.Rclass, r.PackageType),
+		map[string]schema.Attribute{
+			"max_unique_tags": schema.Int64Attribute{
+				Optional: true,
+				Computed: true,
+				Default:  int64default.StaticInt64(0),
+				Validators: []validator.Int64{
+					int64validator.AtLeast(0),
+				},
+				MarkdownDescription: "The maximum number of unique tags of a single OCI object to store in this repository. Once the number tags for an object exceeds this setting, older tags are removed. A value of 0 (default) indicates there is no limit.",
+			},
+			"tag_retention": schema.Int64Attribute{
+				Optional: true,
+				Computed: true,
+				Default:  int64default.StaticInt64(1),
+				Validators: []validator.Int64{
+					int64validator.AtLeast(1),
+				},
+				MarkdownDescription: "If greater than 1, overwritten tags will be saved by their digest, up to the set up number.",
+			},
+		},
+	)
+
+	resp.Schema = schema.Schema{
+		Version:     CurrentSchemaVersion,
+		Attributes:  attributes,
+		Description: r.Description,
+	}
+}
+
 type HelmOciLocalRepositoryParams struct {
 	RepositoryBaseParams
 	MaxUniqueTags int `json:"maxUniqueTags"`
@@ -15,9 +152,9 @@ type HelmOciLocalRepositoryParams struct {
 }
 
 var helmOCISchema = utilsdk.MergeMaps(
-	map[string]*schema.Schema{
+	map[string]*sdkv2_schema.Schema{
 		"max_unique_tags": {
-			Type:     schema.TypeInt,
+			Type:     sdkv2_schema.TypeInt,
 			Optional: true,
 			Default:  0,
 			Description: "The maximum number of unique tags of a single Docker image to store in this repository.\n" +
@@ -26,7 +163,7 @@ var helmOCISchema = utilsdk.MergeMaps(
 			ValidateDiagFunc: validation.ToDiagFunc(validation.IntAtLeast(0)),
 		},
 		"tag_retention": {
-			Type:             schema.TypeInt,
+			Type:             sdkv2_schema.TypeInt,
 			Optional:         true,
 			Computed:         false,
 			Description:      "If greater than 1, overwritten tags will be saved by their digest, up to the set up number. This only applies to manifest V2",
@@ -37,39 +174,3 @@ var helmOCISchema = utilsdk.MergeMaps(
 )
 
 var HelmOCISchemas = GetSchemas(helmOCISchema)
-
-func UnpackLocalHelmOciRepository(data *schema.ResourceData, Rclass string) HelmOciLocalRepositoryParams {
-	d := &utilsdk.ResourceData{ResourceData: data}
-	return HelmOciLocalRepositoryParams{
-		RepositoryBaseParams: UnpackBaseRepo(Rclass, data, repository.HelmOCIPackageType),
-		MaxUniqueTags:        d.GetInt("max_unique_tags", false),
-		TagRetention:         d.GetInt("tag_retention", false),
-	}
-}
-
-func ResourceArtifactoryLocalHelmOciRepository() *schema.Resource {
-	pkr := packer.Default(HelmOCISchemas[CurrentSchemaVersion])
-
-	var unpackLocalHelmOciRepository = func(data *schema.ResourceData) (interface{}, string, error) {
-		repo := UnpackLocalHelmOciRepository(data, Rclass)
-		return repo, repo.Id(), nil
-	}
-
-	constructor := func() (interface{}, error) {
-		return &HelmOciLocalRepositoryParams{
-			RepositoryBaseParams: RepositoryBaseParams{
-				PackageType: repository.HelmOCIPackageType,
-				Rclass:      Rclass,
-			},
-			TagRetention:  1,
-			MaxUniqueTags: 0, // no limit
-		}, nil
-	}
-
-	return repository.MkResourceSchema(
-		HelmOCISchemas,
-		pkr,
-		unpackLocalHelmOciRepository,
-		constructor,
-	)
-}
diff --git a/pkg/artifactory/resource/repository/local/resource_artifactory_local_helmoci_repository_test.go b/pkg/artifactory/resource/repository/local/resource_artifactory_local_helmoci_repository_test.go
new file mode 100644
index 00000000..9ca527ab
--- /dev/null
+++ b/pkg/artifactory/resource/repository/local/resource_artifactory_local_helmoci_repository_test.go
@@ -0,0 +1,98 @@
+package local_test
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/plancheck"
+	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/acctest"
+	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/artifactory/resource/repository"
+	"github.com/jfrog/terraform-provider-shared/testutil"
+	"github.com/jfrog/terraform-provider-shared/util"
+	"github.com/jfrog/terraform-provider-shared/validator"
+)
+
+func TestAccLocalHelmOciRepository(t *testing.T) {
+	_, fqrn, name := testutil.MkNames("helmoci-local", "artifactory_local_helmoci_repository")
+	params := map[string]interface{}{
+		"retention": testutil.RandSelect(1, 5, 10),
+		"max_tags":  testutil.RandSelect(0, 5, 10),
+		"name":      name,
+	}
+	localRepositoryBasic := util.ExecuteTemplate("TestAccLocalHelmOciRepository", `
+		resource "artifactory_local_helmoci_repository" "{{ .name }}" {
+			key 	     = "{{ .name }}"
+			tag_retention = {{ .retention }}
+			max_unique_tags = {{ .max_tags }}
+		}
+	`, params)
+
+	resource.Test(t, resource.TestCase{
+		ProtoV6ProviderFactories: acctest.ProtoV6ProviderFactories,
+		CheckDestroy:             acctest.VerifyDeleted(t, fqrn, "", acctest.CheckRepo),
+		Steps: []resource.TestStep{
+			{
+				Config: localRepositoryBasic,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(fqrn, "key", name),
+					resource.TestCheckResourceAttr(fqrn, "tag_retention", fmt.Sprintf("%d", params["retention"])),
+					resource.TestCheckResourceAttr(fqrn, "max_unique_tags", fmt.Sprintf("%d", params["max_tags"])),
+					resource.TestCheckResourceAttr(fqrn, "repo_layout_ref", func() string {
+						r, _ := repository.GetDefaultRepoLayoutRef("local", repository.HelmOCIPackageType)
+						return r
+					}()), //Check to ensure repository layout is set as per default even when it is not passed.
+				),
+			},
+			{
+				ResourceName:      fqrn,
+				ImportState:       true,
+				ImportStateVerify: true,
+				ImportStateCheck:  validator.CheckImportState(name, "key"),
+			},
+		},
+	})
+}
+
+func TestAccLocalHelmOCIRepository_UpgradeFromSDKv2(t *testing.T) {
+	_, fqrn, name := testutil.MkNames("helmoci-local", "artifactory_local_helmoci_repository")
+	params := map[string]interface{}{
+		"retention": testutil.RandSelect(1, 5, 10),
+		"max_tags":  testutil.RandSelect(0, 5, 10),
+		"name":      name,
+	}
+	config := util.ExecuteTemplate("TestAccLocalHelmOciRepository", `
+		resource "artifactory_local_helmoci_repository" "{{ .name }}" {
+			key 	     = "{{ .name }}"
+			tag_retention = {{ .retention }}
+			max_unique_tags = {{ .max_tags }}
+		}
+	`, params)
+
+	resource.Test(t, resource.TestCase{
+		Steps: []resource.TestStep{
+			{
+				ExternalProviders: map[string]resource.ExternalProvider{
+					"artifactory": {
+						VersionConstraint: "12.8.0",
+						Source:            "jfrog/artifactory",
+					},
+				},
+				Config: config,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(fqrn, "id", name),
+					resource.TestCheckResourceAttr(fqrn, "key", name),
+				),
+			},
+			{
+				ProtoV6ProviderFactories: acctest.ProtoV6ProviderFactories,
+				Config:                   config,
+				ConfigPlanChecks: resource.ConfigPlanChecks{
+					PreApply: []plancheck.PlanCheck{
+						plancheck.ExpectEmptyPlan(),
+					},
+				},
+			},
+		},
+	})
+}
diff --git a/pkg/artifactory/resource/repository/local/resource_artifactory_local_java_repository.go b/pkg/artifactory/resource/repository/local/resource_artifactory_local_java_repository.go
index 3cdc1ed9..99a1244d 100644
--- a/pkg/artifactory/resource/repository/local/resource_artifactory_local_java_repository.go
+++ b/pkg/artifactory/resource/repository/local/resource_artifactory_local_java_repository.go
@@ -1,23 +1,220 @@
 package local
 
 import (
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"context"
+	"reflect"
+
+	"github.com/hashicorp/terraform-plugin-framework-validators/int64validator"
+	"github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator"
+	"github.com/hashicorp/terraform-plugin-framework/diag"
+	"github.com/hashicorp/terraform-plugin-framework/resource"
+	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
+	"github.com/hashicorp/terraform-plugin-framework/resource/schema/booldefault"
+	"github.com/hashicorp/terraform-plugin-framework/resource/schema/int64default"
+	"github.com/hashicorp/terraform-plugin-framework/resource/schema/stringdefault"
+	"github.com/hashicorp/terraform-plugin-framework/schema/validator"
+	"github.com/hashicorp/terraform-plugin-framework/types"
+	sdkv2_schema "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/artifactory/resource/repository"
-	"github.com/jfrog/terraform-provider-shared/packer"
-	utilsdk "github.com/jfrog/terraform-provider-shared/util/sdk"
-	"github.com/jfrog/terraform-provider-shared/validator"
+	sdkv2_validator "github.com/jfrog/terraform-provider-shared/validator"
 	"github.com/samber/lo"
 )
 
-func GetJavaSchemas(packageType string, suppressPom bool) map[int16]map[string]*schema.Schema {
+func NewJavaLocalRepositoryResource(packageType string, suppressPom bool) func() resource.Resource {
+	return func() resource.Resource {
+		return &localJavaResource{
+			localResource: NewLocalRepositoryResource(
+				packageType,
+				repository.PackageNameLookup[packageType],
+				reflect.TypeFor[LocalJavaResourceModel](),
+				reflect.TypeFor[LocalJavaAPIModel](),
+			),
+			suppressPom: suppressPom,
+		}
+	}
+}
+
+type localJavaResource struct {
+	localResource
+	suppressPom bool
+}
+
+type LocalJavaResourceModel struct {
+	LocalResourceModel
+	ChecksumPolicyType           types.String `tfsdk:"checksum_policy_type"`
+	SnapshotVersionBehavior      types.String `tfsdk:"snapshot_version_behavior"`
+	MaxUniqueSnapshots           types.Int64  `tfsdk:"max_unique_snapshots"`
+	HandleReleases               types.Bool   `tfsdk:"handle_releases"`
+	HandleSnapshots              types.Bool   `tfsdk:"handle_snapshots"`
+	SuppressPOMConsistencyChecks types.Bool   `tfsdk:"suppress_pom_consistency_checks"`
+}
+
+func (r *LocalJavaResourceModel) GetCreateResourcePlanData(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) {
+	// Read Terraform plan data into the model
+	resp.Diagnostics.Append(req.Plan.Get(ctx, r)...)
+}
+
+func (r LocalJavaResourceModel) SetCreateResourceStateData(ctx context.Context, resp *resource.CreateResponse) {
+	// Save data into Terraform state
+	resp.Diagnostics.Append(resp.State.Set(ctx, &r)...)
+}
+
+func (r *LocalJavaResourceModel) GetReadResourceStateData(ctx context.Context, req resource.ReadRequest, resp *resource.ReadResponse) {
+	// Read Terraform state data into the model
+	resp.Diagnostics.Append(req.State.Get(ctx, r)...)
+}
+
+func (r LocalJavaResourceModel) SetReadResourceStateData(ctx context.Context, resp *resource.ReadResponse) {
+	// Save data into Terraform state
+	resp.Diagnostics.Append(resp.State.Set(ctx, &r)...)
+}
+
+func (r *LocalJavaResourceModel) GetUpdateResourcePlanData(ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse) {
+	// Read Terraform state data into the model
+	resp.Diagnostics.Append(req.Plan.Get(ctx, r)...)
+}
+
+func (r *LocalJavaResourceModel) GetUpdateResourceStateData(ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse) {
+	// Read Terraform state data into the model
+	resp.Diagnostics.Append(req.State.Get(ctx, r)...)
+}
+
+func (r LocalJavaResourceModel) SetUpdateResourceStateData(ctx context.Context, resp *resource.UpdateResponse) {
+	// Save data into Terraform state
+	resp.Diagnostics.Append(resp.State.Set(ctx, &r)...)
+}
+
+func (r LocalJavaResourceModel) ToAPIModel(ctx context.Context, packageType string) (interface{}, diag.Diagnostics) {
+	diags := diag.Diagnostics{}
+
+	model, d := r.LocalResourceModel.ToAPIModel(ctx, packageType)
+	if d != nil {
+		diags.Append(d...)
+	}
+
+	localAPIModel := model.(LocalAPIModel)
+	localAPIModel.RepoLayoutRef = r.RepoLayoutRef.ValueString()
+
+	return LocalJavaAPIModel{
+		LocalAPIModel:                localAPIModel,
+		ChecksumPolicyType:           r.ChecksumPolicyType.ValueString(),
+		SnapshotVersionBehavior:      r.SnapshotVersionBehavior.ValueString(),
+		MaxUniqueSnapshots:           r.MaxUniqueSnapshots.ValueInt64(),
+		HandleReleases:               r.HandleReleases.ValueBool(),
+		HandleSnapshots:              r.HandleSnapshots.ValueBool(),
+		SuppressPOMConsistencyChecks: r.SuppressPOMConsistencyChecks.ValueBool(),
+	}, diags
+}
+
+func (r *LocalJavaResourceModel) FromAPIModel(ctx context.Context, apiModel interface{}) diag.Diagnostics {
+	diags := diag.Diagnostics{}
+
+	model := apiModel.(*LocalJavaAPIModel)
+
+	r.LocalResourceModel.FromAPIModel(ctx, model.LocalAPIModel)
+
+	r.RepoLayoutRef = types.StringValue(model.RepoLayoutRef)
+	r.ChecksumPolicyType = types.StringValue(model.ChecksumPolicyType)
+	r.SnapshotVersionBehavior = types.StringValue(model.SnapshotVersionBehavior)
+	r.MaxUniqueSnapshots = types.Int64Value(model.MaxUniqueSnapshots)
+	r.HandleReleases = types.BoolValue(model.HandleReleases)
+	r.HandleSnapshots = types.BoolValue(model.HandleSnapshots)
+	r.SuppressPOMConsistencyChecks = types.BoolValue(model.SuppressPOMConsistencyChecks)
+
+	return diags
+}
+
+type LocalJavaAPIModel struct {
+	LocalAPIModel
+	ChecksumPolicyType           string `json:"checksumPolicyType"`
+	SnapshotVersionBehavior      string `json:"snapshotVersionBehavior"`
+	MaxUniqueSnapshots           int64  `json:"maxUniqueSnapshots"`
+	HandleReleases               bool   `json:"handleReleases"`
+	HandleSnapshots              bool   `json:"handleSnapshots"`
+	SuppressPOMConsistencyChecks bool   `json:"suppressPomConsistencyChecks"`
+}
+
+func (r *localJavaResource) Schema(ctx context.Context, req resource.SchemaRequest, resp *resource.SchemaResponse) {
+	attributes := lo.Assign(
+		LocalAttributes,
+		repository.RepoLayoutRefAttribute(r.Rclass, r.PackageType),
+		map[string]schema.Attribute{
+			"checksum_policy_type": schema.StringAttribute{
+				Optional: true,
+				Computed: true,
+				Default:  stringdefault.StaticString("client-checksums"),
+				Validators: []validator.String{
+					stringvalidator.OneOf("client-checksums", "server-generated-checksums"),
+				},
+				MarkdownDescription: "Checksum policy determines how Artifactory behaves when a client checksum for a deployed " +
+					"resource is missing or conflicts with the locally calculated checksum (bad checksum). " +
+					`Options are: "client-checksums", or "server-generated-checksums". Default: "client-checksums"\n ` +
+					"For more details, please refer to Checksum Policy - " +
+					"https://www.jfrog.com/confluence/display/JFROG/Local+Repositories#LocalRepositories-ChecksumPolicy",
+			},
+			"snapshot_version_behavior": schema.StringAttribute{
+				Optional: true,
+				Computed: true,
+				Default:  stringdefault.StaticString("unique"),
+				Validators: []validator.String{
+					stringvalidator.OneOf("unique", "non-unique", "deployer"),
+				},
+				MarkdownDescription: "Specifies the naming convention for Maven SNAPSHOT versions. The options are - " +
+					"`unique`: Version number is based on a time-stamp (default), " +
+					"`non-unique`: Version number uses a self-overriding naming pattern of artifactId-version-SNAPSHOT.type, " +
+					"`deployer`: Respects the settings in the Maven client that is deploying the artifact.",
+			},
+			"max_unique_snapshots": schema.Int64Attribute{
+				Optional: true,
+				Computed: true,
+				Default:  int64default.StaticInt64(0),
+				Validators: []validator.Int64{
+					int64validator.AtLeast(0),
+				},
+				MarkdownDescription: "The maximum number of unique snapshots of a single artifact to store. Once the number of " +
+					"snapshots exceeds this setting, older versions are removed. A value of 0 (default) indicates there is " +
+					"no limit, and unique snapshots are not cleaned up.",
+			},
+			"handle_releases": schema.BoolAttribute{
+				Optional:            true,
+				Computed:            true,
+				Default:             booldefault.StaticBool(true),
+				MarkdownDescription: "If set, Artifactory allows you to deploy release artifacts into this repository.",
+			},
+			"handle_snapshots": schema.BoolAttribute{
+				Optional:            true,
+				Computed:            true,
+				Default:             booldefault.StaticBool(true),
+				MarkdownDescription: "If set, Artifactory allows you to deploy snapshot artifacts into this repository.",
+			},
+			"suppress_pom_consistency_checks": schema.BoolAttribute{
+				Optional: true,
+				Computed: true,
+				Default:  booldefault.StaticBool(r.suppressPom),
+				MarkdownDescription: "By default, Artifactory keeps your repositories healthy by refusing POMs with incorrect " +
+					"coordinates (path). If the groupId:artifactId:version information inside the POM does not match the " +
+					"deployed path, Artifactory rejects the deployment with a `409 Conflict` error. You can disable this " +
+					"behavior by setting the Suppress POM Consistency Checks checkbox.",
+			},
+		},
+	)
+
+	resp.Schema = schema.Schema{
+		Version:     CurrentSchemaVersion,
+		Attributes:  attributes,
+		Description: r.Description,
+	}
+}
+
+func GetJavaSchemas(packageType string, suppressPom bool) map[int16]map[string]*sdkv2_schema.Schema {
 	javaSchema := lo.Assign(
-		map[string]*schema.Schema{
+		map[string]*sdkv2_schema.Schema{
 			"checksum_policy_type": {
-				Type:             schema.TypeString,
+				Type:             sdkv2_schema.TypeString,
 				Optional:         true,
 				Default:          "client-checksums",
-				ValidateDiagFunc: validator.StringInSlice(true, "client-checksums", "server-generated-checksums"),
+				ValidateDiagFunc: sdkv2_validator.StringInSlice(true, "client-checksums", "server-generated-checksums"),
 				Description: "Checksum policy determines how Artifactory behaves when a client checksum for a deployed " +
 					"resource is missing or conflicts with the locally calculated checksum (bad checksum). " +
 					`Options are: "client-checksums", or "server-generated-checksums". Default: "client-checksums"\n ` +
@@ -25,17 +222,17 @@ func GetJavaSchemas(packageType string, suppressPom bool) map[int16]map[string]*
 					"https://www.jfrog.com/confluence/display/JFROG/Local+Repositories#LocalRepositories-ChecksumPolicy",
 			},
 			"snapshot_version_behavior": {
-				Type:             schema.TypeString,
+				Type:             sdkv2_schema.TypeString,
 				Optional:         true,
 				Default:          "unique",
-				ValidateDiagFunc: validator.StringInSlice(true, "unique", "non-unique", "deployer"),
+				ValidateDiagFunc: sdkv2_validator.StringInSlice(true, "unique", "non-unique", "deployer"),
 				Description: "Specifies the naming convention for Maven SNAPSHOT versions.\nThe options are " +
 					"-\nunique: Version number is based on a time-stamp (default)\nnon-unique: Version number uses a" +
 					" self-overriding naming pattern of artifactId-version-SNAPSHOT.type\ndeployer: Respects the settings " +
 					"in the Maven client that is deploying the artifact.",
 			},
 			"max_unique_snapshots": {
-				Type:             schema.TypeInt,
+				Type:             sdkv2_schema.TypeInt,
 				Optional:         true,
 				Default:          0,
 				ValidateDiagFunc: validation.ToDiagFunc(validation.IntAtLeast(0)),
@@ -44,19 +241,19 @@ func GetJavaSchemas(packageType string, suppressPom bool) map[int16]map[string]*
 					"no limit, and unique snapshots are not cleaned up.",
 			},
 			"handle_releases": {
-				Type:        schema.TypeBool,
+				Type:        sdkv2_schema.TypeBool,
 				Optional:    true,
 				Default:     true,
 				Description: "If set, Artifactory allows you to deploy release artifacts into this repository.",
 			},
 			"handle_snapshots": {
-				Type:        schema.TypeBool,
+				Type:        sdkv2_schema.TypeBool,
 				Optional:    true,
 				Default:     true,
 				Description: "If set, Artifactory allows you to deploy snapshot artifacts into this repository.",
 			},
 			"suppress_pom_consistency_checks": {
-				Type:     schema.TypeBool,
+				Type:     sdkv2_schema.TypeBool,
 				Optional: true,
 				Default:  suppressPom,
 				Description: "By default, Artifactory keeps your repositories healthy by refusing POMs with incorrect " +
@@ -68,7 +265,7 @@ func GetJavaSchemas(packageType string, suppressPom bool) map[int16]map[string]*
 		repository.RepoLayoutRefSDKv2Schema(Rclass, packageType),
 	)
 
-	return map[int16]map[string]*schema.Schema{
+	return map[int16]map[string]*sdkv2_schema.Schema{
 		0: lo.Assign(
 			BaseSchemaV1,
 			javaSchema,
@@ -89,42 +286,3 @@ type JavaLocalRepositoryParams struct {
 	HandleSnapshots              bool   `hcl:"handle_snapshots" json:"handleSnapshots"`
 	SuppressPomConsistencyChecks bool   `hcl:"suppress_pom_consistency_checks" json:"suppressPomConsistencyChecks"`
 }
-
-var UnpackLocalJavaRepository = func(data *schema.ResourceData, Rclass string, packageType string) JavaLocalRepositoryParams {
-	d := &utilsdk.ResourceData{ResourceData: data}
-	return JavaLocalRepositoryParams{
-		RepositoryBaseParams:         UnpackBaseRepo(Rclass, data, packageType),
-		ChecksumPolicyType:           d.GetString("checksum_policy_type", false),
-		SnapshotVersionBehavior:      d.GetString("snapshot_version_behavior", false),
-		MaxUniqueSnapshots:           d.GetInt("max_unique_snapshots", false),
-		HandleReleases:               d.GetBool("handle_releases", false),
-		HandleSnapshots:              d.GetBool("handle_snapshots", false),
-		SuppressPomConsistencyChecks: d.GetBool("suppress_pom_consistency_checks", false),
-	}
-}
-
-func ResourceArtifactoryLocalJavaRepository(packageType string, suppressPom bool) *schema.Resource {
-	var unPackLocalJavaRepository = func(data *schema.ResourceData) (interface{}, string, error) {
-		repo := UnpackLocalJavaRepository(data, Rclass, packageType)
-		return repo, repo.Id(), nil
-	}
-
-	javaSchemas := GetJavaSchemas(packageType, suppressPom)
-
-	constructor := func() (interface{}, error) {
-		return &JavaLocalRepositoryParams{
-			RepositoryBaseParams: RepositoryBaseParams{
-				PackageType: packageType,
-				Rclass:      Rclass,
-			},
-			SuppressPomConsistencyChecks: suppressPom,
-		}, nil
-	}
-
-	return repository.MkResourceSchema(
-		javaSchemas,
-		packer.Default(javaSchemas[CurrentSchemaVersion]),
-		unPackLocalJavaRepository,
-		constructor,
-	)
-}
diff --git a/pkg/artifactory/resource/repository/local/resource_artifactory_local_java_repository_test.go b/pkg/artifactory/resource/repository/local/resource_artifactory_local_java_repository_test.go
new file mode 100644
index 00000000..8572d456
--- /dev/null
+++ b/pkg/artifactory/resource/repository/local/resource_artifactory_local_java_repository_test.go
@@ -0,0 +1,203 @@
+package local_test
+
+import (
+	"fmt"
+	"strings"
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/plancheck"
+	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/acctest"
+	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/artifactory/resource/repository"
+	"github.com/jfrog/terraform-provider-shared/testutil"
+	"github.com/jfrog/terraform-provider-shared/util"
+	utilsdk "github.com/jfrog/terraform-provider-shared/util/sdk"
+	"github.com/jfrog/terraform-provider-shared/validator"
+)
+
+var commonJavaParams = map[string]interface{}{
+	"name":                            "",
+	"checksum_policy_type":            testutil.RandSelect("client-checksums", "server-generated-checksums"),
+	"snapshot_version_behavior":       testutil.RandSelect("unique", "non-unique", "deployer"),
+	"max_unique_snapshots":            testutil.RandSelect(0, 5, 10),
+	"handle_releases":                 true,
+	"handle_snapshots":                true,
+	"suppress_pom_consistency_checks": false,
+}
+
+const localJavaRepositoryBasic = `
+		resource "{{ .resource_name }}" "{{ .name }}" {
+		  key                 			  = "{{ .name }}"
+		  checksum_policy_type            = "{{ .checksum_policy_type }}"
+		  snapshot_version_behavior       = "{{ .snapshot_version_behavior }}"
+		  max_unique_snapshots            = {{ .max_unique_snapshots }}
+		  handle_releases                 = {{ .handle_releases }}
+		  handle_snapshots                = {{ .handle_snapshots }}
+		  suppress_pom_consistency_checks = {{ .suppress_pom_consistency_checks }}
+		}
+	`
+
+func TestAccLocalMavenRepository(t *testing.T) {
+	_, fqrn, name := testutil.MkNames("maven-local", "artifactory_local_maven_repository")
+	tempStruct := utilsdk.MergeMaps(commonJavaParams)
+
+	tempStruct["name"] = name
+	tempStruct["resource_name"] = strings.Split(fqrn, ".")[0]
+	tempStruct["suppress_pom_consistency_checks"] = false
+
+	config := util.ExecuteTemplate(fqrn, localJavaRepositoryBasic, tempStruct)
+
+	resource.Test(t, resource.TestCase{
+		ProtoV6ProviderFactories: acctest.ProtoV6ProviderFactories,
+		CheckDestroy:             acctest.VerifyDeleted(t, fqrn, "", acctest.CheckRepo),
+		Steps: []resource.TestStep{
+			{
+				Config: config,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(fqrn, "key", name),
+					resource.TestCheckResourceAttr(fqrn, "checksum_policy_type", fmt.Sprintf("%s", tempStruct["checksum_policy_type"])),
+					resource.TestCheckResourceAttr(fqrn, "snapshot_version_behavior", fmt.Sprintf("%s", tempStruct["snapshot_version_behavior"])),
+					resource.TestCheckResourceAttr(fqrn, "max_unique_snapshots", fmt.Sprintf("%d", tempStruct["max_unique_snapshots"])),
+					resource.TestCheckResourceAttr(fqrn, "handle_releases", fmt.Sprintf("%v", tempStruct["handle_releases"])),
+					resource.TestCheckResourceAttr(fqrn, "handle_snapshots", fmt.Sprintf("%v", tempStruct["handle_snapshots"])),
+					resource.TestCheckResourceAttr(fqrn, "suppress_pom_consistency_checks", fmt.Sprintf("%v", tempStruct["suppress_pom_consistency_checks"])),
+					resource.TestCheckResourceAttr(fqrn, "repo_layout_ref", func() string { r, _ := repository.GetDefaultRepoLayoutRef("local", "maven"); return r }()), //Check to ensure repository layout is set as per default even when it is not passed.
+				),
+			},
+			{
+				ResourceName:      fqrn,
+				ImportState:       true,
+				ImportStateVerify: true,
+				ImportStateCheck:  validator.CheckImportState(name, "key"),
+			},
+		},
+	})
+}
+
+func TestAccLocalMavenRepository_UpgradeFromSDKv2(t *testing.T) {
+	_, fqrn, name := testutil.MkNames("maven-local", "artifactory_local_maven_repository")
+	tempStruct := utilsdk.MergeMaps(commonJavaParams)
+
+	tempStruct["name"] = name
+	tempStruct["resource_name"] = strings.Split(fqrn, ".")[0]
+	tempStruct["suppress_pom_consistency_checks"] = false
+
+	config := util.ExecuteTemplate(fqrn, localJavaRepositoryBasic, tempStruct)
+
+	resource.Test(t, resource.TestCase{
+		Steps: []resource.TestStep{
+			{
+				ExternalProviders: map[string]resource.ExternalProvider{
+					"artifactory": {
+						VersionConstraint: "12.8.0",
+						Source:            "jfrog/artifactory",
+					},
+				},
+				Config: config,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(fqrn, "id", name),
+					resource.TestCheckResourceAttr(fqrn, "key", name),
+				),
+			},
+			{
+				ProtoV6ProviderFactories: acctest.ProtoV6ProviderFactories,
+				Config:                   config,
+				ConfigPlanChecks: resource.ConfigPlanChecks{
+					PreApply: []plancheck.PlanCheck{
+						plancheck.ExpectEmptyPlan(),
+					},
+				},
+			},
+		},
+	})
+}
+
+func makeLocalGradleLikeRepoTestCase(packageType string, t *testing.T) (*testing.T, resource.TestCase) {
+	name := fmt.Sprintf("%s-local", packageType)
+	resourceName := fmt.Sprintf("artifactory_local_%s_repository", packageType)
+	_, fqrn, name := testutil.MkNames(name, resourceName)
+	tempStruct := utilsdk.MergeMaps(commonJavaParams)
+
+	tempStruct["name"] = name
+	tempStruct["resource_name"] = strings.Split(fqrn, ".")[0]
+	tempStruct["suppress_pom_consistency_checks"] = true
+
+	config := util.ExecuteTemplate(fqrn, localJavaRepositoryBasic, tempStruct)
+
+	return t, resource.TestCase{
+		ProtoV6ProviderFactories: acctest.ProtoV6ProviderFactories,
+		CheckDestroy:             acctest.VerifyDeleted(t, fqrn, "", acctest.CheckRepo),
+		Steps: []resource.TestStep{
+			{
+				Config: config,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(fqrn, "key", name),
+					resource.TestCheckResourceAttr(fqrn, "checksum_policy_type", fmt.Sprintf("%s", tempStruct["checksum_policy_type"])),
+					resource.TestCheckResourceAttr(fqrn, "snapshot_version_behavior", fmt.Sprintf("%s", tempStruct["snapshot_version_behavior"])),
+					resource.TestCheckResourceAttr(fqrn, "max_unique_snapshots", fmt.Sprintf("%d", tempStruct["max_unique_snapshots"])),
+					resource.TestCheckResourceAttr(fqrn, "handle_releases", fmt.Sprintf("%v", tempStruct["handle_releases"])),
+					resource.TestCheckResourceAttr(fqrn, "handle_snapshots", fmt.Sprintf("%v", tempStruct["handle_snapshots"])),
+					resource.TestCheckResourceAttr(fqrn, "suppress_pom_consistency_checks", fmt.Sprintf("%v", tempStruct["suppress_pom_consistency_checks"])),
+				),
+			},
+			{
+				ResourceName:      fqrn,
+				ImportState:       true,
+				ImportStateVerify: true,
+				ImportStateCheck:  validator.CheckImportState(name, "key"),
+			},
+		},
+	}
+}
+
+func TestAccLocalGradleLikeRepository(t *testing.T) {
+	for _, packageType := range repository.PackageTypesLikeGradle {
+		t.Run(packageType, func(t *testing.T) {
+			resource.Test(makeLocalGradleLikeRepoTestCase(packageType, t))
+		})
+	}
+}
+
+func TestAccLocalGradleLikeRepository_UpgradeFromSDKv2(t *testing.T) {
+	for _, packageType := range repository.PackageTypesLikeGradle {
+		t.Run(packageType, func(t *testing.T) {
+			name := fmt.Sprintf("%s-local", packageType)
+			resourceName := fmt.Sprintf("artifactory_local_%s_repository", packageType)
+			_, fqrn, name := testutil.MkNames(name, resourceName)
+			tempStruct := utilsdk.MergeMaps(commonJavaParams)
+
+			tempStruct["name"] = name
+			tempStruct["resource_name"] = strings.Split(fqrn, ".")[0]
+			tempStruct["suppress_pom_consistency_checks"] = true
+
+			config := util.ExecuteTemplate(fqrn, localJavaRepositoryBasic, tempStruct)
+
+			resource.Test(t, resource.TestCase{
+				Steps: []resource.TestStep{
+					{
+						ExternalProviders: map[string]resource.ExternalProvider{
+							"artifactory": {
+								VersionConstraint: "12.8.0",
+								Source:            "jfrog/artifactory",
+							},
+						},
+						Config: config,
+						Check: resource.ComposeTestCheckFunc(
+							resource.TestCheckResourceAttr(fqrn, "id", name),
+							resource.TestCheckResourceAttr(fqrn, "key", name),
+						),
+					},
+					{
+						ProtoV6ProviderFactories: acctest.ProtoV6ProviderFactories,
+						Config:                   config,
+						ConfigPlanChecks: resource.ConfigPlanChecks{
+							PreApply: []plancheck.PlanCheck{
+								plancheck.ExpectEmptyPlan(),
+							},
+						},
+					},
+				},
+			})
+		})
+	}
+}
diff --git a/pkg/artifactory/resource/repository/local/resource_artifactory_local_machinelearning_repository.go b/pkg/artifactory/resource/repository/local/resource_artifactory_local_machinelearning_repository.go
index 5704d778..0afbde25 100644
--- a/pkg/artifactory/resource/repository/local/resource_artifactory_local_machinelearning_repository.go
+++ b/pkg/artifactory/resource/repository/local/resource_artifactory_local_machinelearning_repository.go
@@ -7,26 +7,16 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/resource"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
 	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/artifactory/resource/repository"
-	"github.com/jfrog/terraform-provider-shared/util"
 )
 
 func NewMachineLearningLocalRepositoryResource() resource.Resource {
 	return &MachineLearningLocalRepositoryResource{
-		localResource: localResource{
-			BaseResource: repository.BaseResource{
-				JFrogResource: util.JFrogResource{
-					TypeName:                "artifactory_local_machinelearning_repository",
-					ValidArtifactoryVersion: "7.102.0",
-					CollectionEndpoint:      "artifactory/api/repositories",
-					DocumentEndpoint:        "artifactory/api/repositories/{key}",
-				},
-				Description:       "Provides a resource to creates a local Machine Learning repository.\n\nOfficial documentation can be found [here](https://jfrog.com/help/r/jfrog-artifactory-documentation/machine-learning-repositories).",
-				PackageType:       repository.MachineLearningType,
-				Rclass:            Rclass,
-				ResourceModelType: reflect.TypeFor[LocalResourceModel](),
-				APIModelType:      reflect.TypeFor[LocalAPIModel](),
-			},
-		},
+		localResource: NewLocalRepositoryResource(
+			repository.MachineLearningType,
+			"Machine Learning",
+			reflect.TypeFor[LocalResourceModel](),
+			reflect.TypeFor[LocalAPIModel](),
+		),
 	}
 }
 
diff --git a/pkg/artifactory/resource/repository/local/resource_artifactory_local_nuget_repository.go b/pkg/artifactory/resource/repository/local/resource_artifactory_local_nuget_repository.go
index 1676509f..5a958487 100644
--- a/pkg/artifactory/resource/repository/local/resource_artifactory_local_nuget_repository.go
+++ b/pkg/artifactory/resource/repository/local/resource_artifactory_local_nuget_repository.go
@@ -1,24 +1,157 @@
 package local
 
 import (
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"context"
+	"reflect"
+
+	"github.com/hashicorp/terraform-plugin-framework-validators/int64validator"
+	"github.com/hashicorp/terraform-plugin-framework/diag"
+	"github.com/hashicorp/terraform-plugin-framework/resource"
+	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
+	"github.com/hashicorp/terraform-plugin-framework/resource/schema/booldefault"
+	"github.com/hashicorp/terraform-plugin-framework/resource/schema/int64default"
+	"github.com/hashicorp/terraform-plugin-framework/schema/validator"
+	"github.com/hashicorp/terraform-plugin-framework/types"
+	sdkv2_schema "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/artifactory/resource/repository"
-	"github.com/jfrog/terraform-provider-shared/packer"
-	utilsdk "github.com/jfrog/terraform-provider-shared/util/sdk"
 	"github.com/samber/lo"
 )
 
+func NewNugetLocalRepositoryResource() resource.Resource {
+	return &localNugetResource{
+		localResource: NewLocalRepositoryResource(
+			repository.NugetPackageType,
+			"NuGet",
+			reflect.TypeFor[LocalNugetResourceModel](),
+			reflect.TypeFor[LocalNugetAPIModel](),
+		),
+	}
+}
+
+type localNugetResource struct {
+	localResource
+}
+
+type LocalNugetResourceModel struct {
+	LocalResourceModel
+	MaxUniqueSnapshots       types.Int64 `tfsdk:"max_unique_snapshots"`
+	ForceNugetAuthentication types.Bool  `tfsdk:"force_nuget_authentication"`
+}
+
+func (r *LocalNugetResourceModel) GetCreateResourcePlanData(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) {
+	// Read Terraform plan data into the model
+	resp.Diagnostics.Append(req.Plan.Get(ctx, r)...)
+}
+
+func (r LocalNugetResourceModel) SetCreateResourceStateData(ctx context.Context, resp *resource.CreateResponse) {
+	// Save data into Terraform state
+	resp.Diagnostics.Append(resp.State.Set(ctx, &r)...)
+}
+
+func (r *LocalNugetResourceModel) GetReadResourceStateData(ctx context.Context, req resource.ReadRequest, resp *resource.ReadResponse) {
+	// Read Terraform state data into the model
+	resp.Diagnostics.Append(req.State.Get(ctx, r)...)
+}
+
+func (r LocalNugetResourceModel) SetReadResourceStateData(ctx context.Context, resp *resource.ReadResponse) {
+	// Save data into Terraform state
+	resp.Diagnostics.Append(resp.State.Set(ctx, &r)...)
+}
+
+func (r *LocalNugetResourceModel) GetUpdateResourcePlanData(ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse) {
+	// Read Terraform state data into the model
+	resp.Diagnostics.Append(req.Plan.Get(ctx, r)...)
+}
+
+func (r *LocalNugetResourceModel) GetUpdateResourceStateData(ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse) {
+	// Read Terraform state data into the model
+	resp.Diagnostics.Append(req.State.Get(ctx, r)...)
+}
+
+func (r LocalNugetResourceModel) SetUpdateResourceStateData(ctx context.Context, resp *resource.UpdateResponse) {
+	// Save data into Terraform state
+	resp.Diagnostics.Append(resp.State.Set(ctx, &r)...)
+}
+
+func (r LocalNugetResourceModel) ToAPIModel(ctx context.Context, packageType string) (interface{}, diag.Diagnostics) {
+	diags := diag.Diagnostics{}
+
+	model, d := r.LocalResourceModel.ToAPIModel(ctx, packageType)
+	if d != nil {
+		diags.Append(d...)
+	}
+
+	localAPIModel := model.(LocalAPIModel)
+	localAPIModel.RepoLayoutRef = r.RepoLayoutRef.ValueString()
+
+	return LocalNugetAPIModel{
+		LocalAPIModel:            localAPIModel,
+		MaxUniqueSnapshots:       r.MaxUniqueSnapshots.ValueInt64(),
+		ForceNugetAuthentication: r.ForceNugetAuthentication.ValueBool(),
+	}, diags
+}
+
+func (r *LocalNugetResourceModel) FromAPIModel(ctx context.Context, apiModel interface{}) diag.Diagnostics {
+	diags := diag.Diagnostics{}
+
+	model := apiModel.(*LocalNugetAPIModel)
+
+	r.LocalResourceModel.FromAPIModel(ctx, model.LocalAPIModel)
+
+	r.RepoLayoutRef = types.StringValue(model.RepoLayoutRef)
+	r.MaxUniqueSnapshots = types.Int64Value(model.MaxUniqueSnapshots)
+	r.ForceNugetAuthentication = types.BoolValue(model.ForceNugetAuthentication)
+
+	return diags
+}
+
+type LocalNugetAPIModel struct {
+	LocalAPIModel
+	MaxUniqueSnapshots       int64 `json:"maxUniqueSnapshots"`
+	ForceNugetAuthentication bool  `json:"forceNugetAuthentication"`
+}
+
+func (r *localNugetResource) Schema(ctx context.Context, req resource.SchemaRequest, resp *resource.SchemaResponse) {
+	attributes := lo.Assign(
+		LocalAttributes,
+		repository.RepoLayoutRefAttribute(r.Rclass, r.PackageType),
+		map[string]schema.Attribute{
+			"max_unique_snapshots": schema.Int64Attribute{
+				Optional: true,
+				Computed: true,
+				Default:  int64default.StaticInt64(0),
+				Validators: []validator.Int64{
+					int64validator.AtLeast(0),
+				},
+				MarkdownDescription: "The maximum number of unique snapshots of a single artifact to store. Once the number of snapshots exceeds this setting, older versions are removed. A value of 0 (default) indicates there is no limit, and unique snapshots are not cleaned up.",
+			},
+			"force_nuget_authentication": schema.BoolAttribute{
+				Optional:            true,
+				Computed:            true,
+				Default:             booldefault.StaticBool(false),
+				MarkdownDescription: "Force basic authentication credentials in order to use this repository.",
+			},
+		},
+	)
+
+	resp.Schema = schema.Schema{
+		Version:     CurrentSchemaVersion,
+		Attributes:  attributes,
+		Description: r.Description,
+	}
+}
+
 var nugetSchema = lo.Assign(
-	map[string]*schema.Schema{
+	map[string]*sdkv2_schema.Schema{
 		"max_unique_snapshots": {
-			Type:     schema.TypeInt,
+			Type:     sdkv2_schema.TypeInt,
 			Optional: true,
 			Default:  0,
 			Description: "The maximum number of unique snapshots of a single artifact to store.\nOnce the number of " +
 				"snapshots exceeds this setting, older versions are removed.\nA value of 0 (default) indicates there is no limit, and unique snapshots are not cleaned up.",
 		},
 		"force_nuget_authentication": {
-			Type:        schema.TypeBool,
+			Type:        sdkv2_schema.TypeBool,
 			Optional:    true,
 			Default:     false,
 			Description: "Force basic authentication credentials in order to use this repository.",
@@ -35,37 +168,30 @@ type NugetLocalRepositoryParams struct {
 	ForceNugetAuthentication bool `hcl:"force_nuget_authentication" json:"forceNugetAuthentication"`
 }
 
-func UnpackLocalNugetRepository(data *schema.ResourceData, Rclass string) NugetLocalRepositoryParams {
-	d := &utilsdk.ResourceData{ResourceData: data}
-	return NugetLocalRepositoryParams{
-		RepositoryBaseParams:     UnpackBaseRepo(Rclass, data, repository.NugetPackageType),
-		MaxUniqueSnapshots:       d.GetInt("max_unique_snapshots", false),
-		ForceNugetAuthentication: d.GetBool("force_nuget_authentication", false),
-	}
-}
-
-func ResourceArtifactoryLocalNugetRepository() *schema.Resource {
-
-	var unPackLocalNugetRepository = func(data *schema.ResourceData) (interface{}, string, error) {
-		repo := UnpackLocalNugetRepository(data, Rclass)
-		return repo, repo.Id(), nil
-	}
-
-	constructor := func() (interface{}, error) {
-		return &NugetLocalRepositoryParams{
-			RepositoryBaseParams: RepositoryBaseParams{
-				PackageType: repository.NugetPackageType,
-				Rclass:      Rclass,
-			},
-			MaxUniqueSnapshots:       0,
-			ForceNugetAuthentication: false,
-		}, nil
-	}
-
-	return repository.MkResourceSchema(
-		NugetSchemas,
-		packer.Default(NugetSchemas[CurrentSchemaVersion]),
-		unPackLocalNugetRepository,
-		constructor,
-	)
-}
+//
+//
+// func ResourceArtifactoryLocalNugetRepository() *schema.Resource {
+//
+// 	var unPackLocalNugetRepository = func(data *schema.ResourceData) (interface{}, string, error) {
+// 		repo := UnpackLocalNugetRepository(data, Rclass)
+// 		return repo, repo.Id(), nil
+// 	}
+//
+// 	constructor := func() (interface{}, error) {
+// 		return &NugetLocalRepositoryParams{
+// 			RepositoryBaseParams: RepositoryBaseParams{
+// 				PackageType: repository.NugetPackageType,
+// 				Rclass:      Rclass,
+// 			},
+// 			MaxUniqueSnapshots:       0,
+// 			ForceNugetAuthentication: false,
+// 		}, nil
+// 	}
+//
+// 	return repository.MkResourceSchema(
+// 		NugetSchemas,
+// 		packer.Default(NugetSchemas[CurrentSchemaVersion]),
+// 		unPackLocalNugetRepository,
+// 		constructor,
+// 	)
+// }
diff --git a/pkg/artifactory/resource/repository/local/resource_artifactory_local_nuget_repository_test.go b/pkg/artifactory/resource/repository/local/resource_artifactory_local_nuget_repository_test.go
new file mode 100644
index 00000000..400a7d64
--- /dev/null
+++ b/pkg/artifactory/resource/repository/local/resource_artifactory_local_nuget_repository_test.go
@@ -0,0 +1,95 @@
+package local_test
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/plancheck"
+	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/acctest"
+	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/artifactory/resource/repository"
+	"github.com/jfrog/terraform-provider-shared/testutil"
+	"github.com/jfrog/terraform-provider-shared/util"
+	"github.com/jfrog/terraform-provider-shared/validator"
+)
+
+func TestAccLocalNugetRepository(t *testing.T) {
+	_, fqrn, name := testutil.MkNames("nuget-local", "artifactory_local_nuget_repository")
+	params := map[string]interface{}{
+		"force_nuget_authentication": testutil.RandBool(),
+		"max_unique_snapshots":       testutil.RandSelect(0, 5, 10),
+		"name":                       name,
+	}
+	localRepositoryBasic := util.ExecuteTemplate("TestAccLocalNugetRepository", `
+		resource "artifactory_local_nuget_repository" "{{ .name }}" {
+		  key                 = "{{ .name }}"
+		  max_unique_snapshots = {{ .max_unique_snapshots }}
+		  force_nuget_authentication = {{ .force_nuget_authentication }}
+		}
+	`, params)
+
+	resource.Test(t, resource.TestCase{
+		ProtoV6ProviderFactories: acctest.ProtoV6ProviderFactories,
+		CheckDestroy:             acctest.VerifyDeleted(t, fqrn, "", acctest.CheckRepo),
+		Steps: []resource.TestStep{
+			{
+				Config: localRepositoryBasic,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(fqrn, "key", name),
+					resource.TestCheckResourceAttr(fqrn, "max_unique_snapshots", fmt.Sprintf("%d", params["max_unique_snapshots"])),
+					resource.TestCheckResourceAttr(fqrn, "force_nuget_authentication", fmt.Sprintf("%t", params["force_nuget_authentication"])),
+					resource.TestCheckResourceAttr(fqrn, "repo_layout_ref", func() string { r, _ := repository.GetDefaultRepoLayoutRef("local", "nuget"); return r }()), //Check to ensure repository layout is set as per default even when it is not passed.
+				),
+			},
+			{
+				ResourceName:      fqrn,
+				ImportState:       true,
+				ImportStateVerify: true,
+				ImportStateCheck:  validator.CheckImportState(name, "key"),
+			},
+		},
+	})
+}
+
+func TestAccLocalNugetRepository_UpgradeFromSDKv2(t *testing.T) {
+	_, fqrn, name := testutil.MkNames("nuget-local", "artifactory_local_nuget_repository")
+	params := map[string]interface{}{
+		"force_nuget_authentication": testutil.RandBool(),
+		"max_unique_snapshots":       testutil.RandSelect(0, 5, 10),
+		"name":                       name,
+	}
+	config := util.ExecuteTemplate("TestAccLocalNugetRepository", `
+		resource "artifactory_local_nuget_repository" "{{ .name }}" {
+		  key                 = "{{ .name }}"
+		  max_unique_snapshots = {{ .max_unique_snapshots }}
+		  force_nuget_authentication = {{ .force_nuget_authentication }}
+		}
+	`, params)
+
+	resource.Test(t, resource.TestCase{
+		Steps: []resource.TestStep{
+			{
+				ExternalProviders: map[string]resource.ExternalProvider{
+					"artifactory": {
+						VersionConstraint: "12.8.0",
+						Source:            "jfrog/artifactory",
+					},
+				},
+				Config: config,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(fqrn, "id", name),
+					resource.TestCheckResourceAttr(fqrn, "key", name),
+				),
+			},
+			{
+				ProtoV6ProviderFactories: acctest.ProtoV6ProviderFactories,
+				Config:                   config,
+				ConfigPlanChecks: resource.ConfigPlanChecks{
+					PreApply: []plancheck.PlanCheck{
+						plancheck.ExpectEmptyPlan(),
+					},
+				},
+			},
+		},
+	})
+}
diff --git a/pkg/artifactory/resource/repository/local/resource_artifactory_local_oci_repository.go b/pkg/artifactory/resource/repository/local/resource_artifactory_local_oci_repository.go
index 52302511..ec613e7b 100644
--- a/pkg/artifactory/resource/repository/local/resource_artifactory_local_oci_repository.go
+++ b/pkg/artifactory/resource/repository/local/resource_artifactory_local_oci_repository.go
@@ -1,14 +1,151 @@
 package local
 
 import (
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"context"
+	"reflect"
+
+	"github.com/hashicorp/terraform-plugin-framework-validators/int64validator"
+	"github.com/hashicorp/terraform-plugin-framework/diag"
+	"github.com/hashicorp/terraform-plugin-framework/resource"
+	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
+	"github.com/hashicorp/terraform-plugin-framework/resource/schema/int64default"
+	"github.com/hashicorp/terraform-plugin-framework/schema/validator"
+	"github.com/hashicorp/terraform-plugin-framework/types"
+	sdkv2_schema "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/artifactory/resource/repository"
-	"github.com/jfrog/terraform-provider-shared/packer"
-	utilsdk "github.com/jfrog/terraform-provider-shared/util/sdk"
 	"github.com/samber/lo"
 )
 
+func NewOCILocalRepositoryResource() resource.Resource {
+	return &localOCIResource{
+		localResource: NewLocalRepositoryResource(
+			repository.OCIPackageType,
+			"OCI",
+			reflect.TypeFor[LocalOCIResourceModel](),
+			reflect.TypeFor[LocalOCIAPIModel](),
+		),
+	}
+}
+
+type localOCIResource struct {
+	localResource
+}
+
+type LocalOCIResourceModel struct {
+	LocalResourceModel
+	MaxUniqueTags types.Int64 `tfsdk:"max_unique_tags"`
+	TagRetention  types.Int64 `tfsdk:"tag_retention"`
+}
+
+func (r *LocalOCIResourceModel) GetCreateResourcePlanData(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) {
+	// Read Terraform plan data into the model
+	resp.Diagnostics.Append(req.Plan.Get(ctx, r)...)
+}
+
+func (r LocalOCIResourceModel) SetCreateResourceStateData(ctx context.Context, resp *resource.CreateResponse) {
+	// Save data into Terraform state
+	resp.Diagnostics.Append(resp.State.Set(ctx, &r)...)
+}
+
+func (r *LocalOCIResourceModel) GetReadResourceStateData(ctx context.Context, req resource.ReadRequest, resp *resource.ReadResponse) {
+	// Read Terraform state data into the model
+	resp.Diagnostics.Append(req.State.Get(ctx, r)...)
+}
+
+func (r LocalOCIResourceModel) SetReadResourceStateData(ctx context.Context, resp *resource.ReadResponse) {
+	// Save data into Terraform state
+	resp.Diagnostics.Append(resp.State.Set(ctx, &r)...)
+}
+
+func (r *LocalOCIResourceModel) GetUpdateResourcePlanData(ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse) {
+	// Read Terraform state data into the model
+	resp.Diagnostics.Append(req.Plan.Get(ctx, r)...)
+}
+
+func (r *LocalOCIResourceModel) GetUpdateResourceStateData(ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse) {
+	// Read Terraform state data into the model
+	resp.Diagnostics.Append(req.State.Get(ctx, r)...)
+}
+
+func (r LocalOCIResourceModel) SetUpdateResourceStateData(ctx context.Context, resp *resource.UpdateResponse) {
+	// Save data into Terraform state
+	resp.Diagnostics.Append(resp.State.Set(ctx, &r)...)
+}
+
+func (r LocalOCIResourceModel) ToAPIModel(ctx context.Context, packageType string) (interface{}, diag.Diagnostics) {
+	diags := diag.Diagnostics{}
+
+	model, d := r.LocalResourceModel.ToAPIModel(ctx, packageType)
+	if d != nil {
+		diags.Append(d...)
+	}
+
+	localAPIModel := model.(LocalAPIModel)
+	localAPIModel.RepoLayoutRef = r.RepoLayoutRef.ValueString()
+
+	return LocalOCIAPIModel{
+		LocalAPIModel:    localAPIModel,
+		MaxUniqueTags:    r.MaxUniqueTags.ValueInt64(),
+		DockerApiVersion: "V2",
+		TagRetention:     r.TagRetention.ValueInt64(),
+	}, diags
+}
+
+func (r *LocalOCIResourceModel) FromAPIModel(ctx context.Context, apiModel interface{}) diag.Diagnostics {
+	diags := diag.Diagnostics{}
+
+	model := apiModel.(*LocalOCIAPIModel)
+
+	r.LocalResourceModel.FromAPIModel(ctx, model.LocalAPIModel)
+
+	r.RepoLayoutRef = types.StringValue(model.RepoLayoutRef)
+	r.MaxUniqueTags = types.Int64Value(model.MaxUniqueTags)
+	r.TagRetention = types.Int64Value(model.TagRetention)
+
+	return diags
+}
+
+type LocalOCIAPIModel struct {
+	LocalAPIModel
+	MaxUniqueTags    int64  `json:"maxUniqueTags"`
+	DockerApiVersion string `json:"dockerApiVersion"`
+	TagRetention     int64  `json:"dockerTagRetention"`
+}
+
+func (r *localOCIResource) Schema(ctx context.Context, req resource.SchemaRequest, resp *resource.SchemaResponse) {
+	attributes := lo.Assign(
+		LocalAttributes,
+		repository.RepoLayoutRefAttribute(r.Rclass, r.PackageType),
+		map[string]schema.Attribute{
+			"max_unique_tags": schema.Int64Attribute{
+				Optional: true,
+				Computed: true,
+				Default:  int64default.StaticInt64(0),
+				Validators: []validator.Int64{
+					int64validator.AtLeast(0),
+				},
+				MarkdownDescription: "The maximum number of unique tags of a single OCI image to store in this repository. Once the number tags for an object exceeds this setting, older tags are removed. A value of 0 (default) indicates there is no limit.",
+			},
+			"tag_retention": schema.Int64Attribute{
+				Optional: true,
+				Computed: true,
+				Default:  int64default.StaticInt64(1),
+				Validators: []validator.Int64{
+					int64validator.AtLeast(1),
+				},
+				MarkdownDescription: "If greater than 1, overwritten tags will be saved by their digest, up to the set up number.",
+			},
+		},
+	)
+
+	resp.Schema = schema.Schema{
+		Version:     CurrentSchemaVersion,
+		Attributes:  attributes,
+		Description: r.Description,
+	}
+}
+
 type OciLocalRepositoryParams struct {
 	RepositoryBaseParams
 	MaxUniqueTags    int    `json:"maxUniqueTags"`
@@ -17,9 +154,9 @@ type OciLocalRepositoryParams struct {
 }
 
 var ociSchema = lo.Assign(
-	map[string]*schema.Schema{
+	map[string]*sdkv2_schema.Schema{
 		"max_unique_tags": {
-			Type:     schema.TypeInt,
+			Type:     sdkv2_schema.TypeInt,
 			Optional: true,
 			Default:  0,
 			Description: "The maximum number of unique tags of a single OCI image to store in this repository.\n" +
@@ -27,7 +164,7 @@ var ociSchema = lo.Assign(
 			ValidateDiagFunc: validation.ToDiagFunc(validation.IntAtLeast(0)),
 		},
 		"tag_retention": {
-			Type:             schema.TypeInt,
+			Type:             sdkv2_schema.TypeInt,
 			Optional:         true,
 			Computed:         false,
 			Description:      "If greater than 1, overwritten tags will be saved by their digest, up to the set up number.",
@@ -38,39 +175,3 @@ var ociSchema = lo.Assign(
 )
 
 var OCILocalSchemas = GetSchemas(ociSchema)
-
-func UnpackLocalOciRepository(data *schema.ResourceData, Rclass string) OciLocalRepositoryParams {
-	d := &utilsdk.ResourceData{ResourceData: data}
-	return OciLocalRepositoryParams{
-		RepositoryBaseParams: UnpackBaseRepo(Rclass, data, repository.OCIPackageType),
-		MaxUniqueTags:        d.GetInt("max_unique_tags", false),
-		DockerApiVersion:     "V2",
-		TagRetention:         d.GetInt("tag_retention", false),
-	}
-}
-
-func ResourceArtifactoryLocalOciRepository() *schema.Resource {
-	var unpackLocalOciRepository = func(data *schema.ResourceData) (interface{}, string, error) {
-		repo := UnpackLocalOciRepository(data, Rclass)
-		return repo, repo.Id(), nil
-	}
-
-	constructor := func() (interface{}, error) {
-		return &OciLocalRepositoryParams{
-			RepositoryBaseParams: RepositoryBaseParams{
-				PackageType: repository.OCIPackageType,
-				Rclass:      Rclass,
-			},
-			DockerApiVersion: "V2",
-			TagRetention:     1,
-			MaxUniqueTags:    0, // no limit
-		}, nil
-	}
-
-	return repository.MkResourceSchema(
-		OCILocalSchemas,
-		packer.Default(OCILocalSchemas[CurrentSchemaVersion]),
-		unpackLocalOciRepository,
-		constructor,
-	)
-}
diff --git a/pkg/artifactory/resource/repository/local/resource_artifactory_local_oci_repository_test.go b/pkg/artifactory/resource/repository/local/resource_artifactory_local_oci_repository_test.go
new file mode 100644
index 00000000..11262756
--- /dev/null
+++ b/pkg/artifactory/resource/repository/local/resource_artifactory_local_oci_repository_test.go
@@ -0,0 +1,125 @@
+package local_test
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/plancheck"
+	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/acctest"
+	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/artifactory/resource/repository"
+	"github.com/jfrog/terraform-provider-shared/testutil"
+	"github.com/jfrog/terraform-provider-shared/util"
+	"github.com/jfrog/terraform-provider-shared/validator"
+)
+
+func TestAccLocalOCIRepository(t *testing.T) {
+	_, fqrn, name := testutil.MkNames("oci-local", "artifactory_local_oci_repository")
+	params := map[string]interface{}{
+		"retention": testutil.RandSelect(1, 5, 10),
+		"max_tags":  testutil.RandSelect(0, 5, 10),
+		"name":      name,
+	}
+
+	config := util.ExecuteTemplate("TestAccLocalOciRepository", `
+		resource "artifactory_local_oci_repository" "{{ .name }}" {
+			key 	        = "{{ .name }}"
+			tag_retention   = {{ .retention }}
+			max_unique_tags = {{ .max_tags }}
+		}
+	`, params)
+
+	updatedParams := map[string]interface{}{
+		"retention": testutil.RandSelect(1, 5, 10),
+		"max_tags":  testutil.RandSelect(0, 5, 10),
+		"name":      name,
+	}
+	updatedConfig := util.ExecuteTemplate("TestAccLocalOciRepository", `
+		resource "artifactory_local_oci_repository" "{{ .name }}" {
+			key 	        = "{{ .name }}"
+			tag_retention   = {{ .retention }}
+			max_unique_tags = {{ .max_tags }}
+		}
+	`, updatedParams)
+
+	resource.Test(t, resource.TestCase{
+		ProtoV6ProviderFactories: acctest.ProtoV6ProviderFactories,
+		CheckDestroy:             acctest.VerifyDeleted(t, fqrn, "", acctest.CheckRepo),
+		Steps: []resource.TestStep{
+			{
+				Config: config,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(fqrn, "key", name),
+					resource.TestCheckResourceAttr(fqrn, "tag_retention", fmt.Sprintf("%d", params["retention"])),
+					resource.TestCheckResourceAttr(fqrn, "max_unique_tags", fmt.Sprintf("%d", params["max_tags"])),
+					resource.TestCheckResourceAttr(fqrn, "repo_layout_ref", func() string {
+						r, _ := repository.GetDefaultRepoLayoutRef("local", repository.OCIPackageType)
+						return r
+					}()), //Check to ensure repository layout is set as per default even when it is not passed.
+				),
+			},
+			{
+				Config: updatedConfig,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(fqrn, "key", name),
+					resource.TestCheckResourceAttr(fqrn, "tag_retention", fmt.Sprintf("%d", updatedParams["retention"])),
+					resource.TestCheckResourceAttr(fqrn, "max_unique_tags", fmt.Sprintf("%d", updatedParams["max_tags"])),
+					resource.TestCheckResourceAttr(fqrn, "repo_layout_ref", func() string {
+						r, _ := repository.GetDefaultRepoLayoutRef("local", repository.OCIPackageType)
+						return r
+					}()), //Check to ensure repository layout is set as per default even when it is not passed.
+				),
+			},
+			{
+				ResourceName:      fqrn,
+				ImportState:       true,
+				ImportStateVerify: true,
+				ImportStateCheck:  validator.CheckImportState(name, "key"),
+			},
+		},
+	})
+}
+
+func TestAccLocalOCIRepository_UpgradeFromSDKv2(t *testing.T) {
+	_, fqrn, name := testutil.MkNames("oci-local", "artifactory_local_oci_repository")
+	params := map[string]interface{}{
+		"retention": testutil.RandSelect(1, 5, 10),
+		"max_tags":  testutil.RandSelect(0, 5, 10),
+		"name":      name,
+	}
+
+	config := util.ExecuteTemplate("TestAccLocalOciRepository", `
+		resource "artifactory_local_oci_repository" "{{ .name }}" {
+			key 	        = "{{ .name }}"
+			tag_retention   = {{ .retention }}
+			max_unique_tags = {{ .max_tags }}
+		}
+	`, params)
+
+	resource.Test(t, resource.TestCase{
+		Steps: []resource.TestStep{
+			{
+				ExternalProviders: map[string]resource.ExternalProvider{
+					"artifactory": {
+						VersionConstraint: "12.8.0",
+						Source:            "jfrog/artifactory",
+					},
+				},
+				Config: config,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(fqrn, "id", name),
+					resource.TestCheckResourceAttr(fqrn, "key", name),
+				),
+			},
+			{
+				ProtoV6ProviderFactories: acctest.ProtoV6ProviderFactories,
+				Config:                   config,
+				ConfigPlanChecks: resource.ConfigPlanChecks{
+					PreApply: []plancheck.PlanCheck{
+						plancheck.ExpectEmptyPlan(),
+					},
+				},
+			},
+		},
+	})
+}
diff --git a/pkg/artifactory/resource/repository/local/resource_artifactory_local_repository_test.go b/pkg/artifactory/resource/repository/local/resource_artifactory_local_repository_test.go
deleted file mode 100644
index 72823533..00000000
--- a/pkg/artifactory/resource/repository/local/resource_artifactory_local_repository_test.go
+++ /dev/null
@@ -1,563 +0,0 @@
-package local_test
-
-import (
-	"fmt"
-	"strconv"
-	"strings"
-	"testing"
-
-	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
-	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/acctest"
-	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/artifactory/resource/repository"
-	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/artifactory/resource/security"
-	"github.com/jfrog/terraform-provider-shared/testutil"
-	"github.com/jfrog/terraform-provider-shared/util"
-	utilsdk "github.com/jfrog/terraform-provider-shared/util/sdk"
-	"github.com/jfrog/terraform-provider-shared/validator"
-)
-
-func TestAccLocalRpmRepository(t *testing.T) {
-	_, fqrn, name := testutil.MkNames("local-rpm-repo", "artifactory_local_rpm_repository")
-	kpId, kpFqrn, kpName := testutil.MkNames("some-keypair1", "artifactory_keypair")
-	kpId2, kpFqrn2, kpName2 := testutil.MkNames("some-keypair2", "artifactory_keypair")
-	localRepositoryBasic := util.ExecuteTemplate("keypair", `
-		resource "artifactory_keypair" "{{ .kp_name }}" {
-			pair_name  = "{{ .kp_name }}"
-			pair_type = "GPG"
-			alias = "foo-alias{{ .kp_id }}"
-			private_key = <<EOF
------BEGIN PGP PRIVATE KEY BLOCK-----
-lIYEYYU7tRYJKwYBBAHaRw8BAQdAZ8vVdEyrWGssb7cdreG5GDGv6taHX/vWQdDG
-jn7zib/+BwMCFjb4odY28+n0NWj7KZ53BkA0qzzqT9IpIfsW/tLNPTxYEFrDVbcF
-1CuiAgAhyUfBEr9HQaMJBLfIIvo/B3nlWvwWHkiQFuWpsnJ2pj8F8LQqQ2hyaXN0
-aWFuIEJvbmdpb3JubyA8Y2hyaXN0aWFuYkBqZnJvZy5jb20+iJoEExYKAEIWIQSS
-w8jt+9pdVC3Gts7AvzSEkhHbJAUCYYU7tQIbAwUJA8JnAAULCQgHAgMiAgEGFQoJ
-CAsCBBYCAwECHgcCF4AACgkQwL80hJIR2yRQDgD/X1t/hW9+uXdSY59FOClhQw/t
-AzTYjDW+KLKadYJ3RAIBALD53rj7EnrXsSqv9Vqj3mJ7O38eXu50P57tD8ErpHMD
-nIsEYYU7tRIKKwYBBAGXVQEFAQEHQCfT+jXHVkslGAJqVafoeWO8Nwz/oPPzNDJb
-EOASsMRcAwEIB/4HAwK+Wi8OaidLuvQ6yknLUspoRL8KJlQu0JkfLxj6Wl6GrRtf
-MdUBxaGUQX5UzMIqyYstgHKz2kBYvrJijWdOkkRuL82FySSh4yi/97FBikOBiHgE
-GBYKACAWIQSSw8jt+9pdVC3Gts7AvzSEkhHbJAUCYYU7tQIbDAAKCRDAvzSEkhHb
-JNR/AQCQjGWljmP8pYj6ohP8bOwVB4VE5qxjdfWQvBCUA0LFwgEAxLGVeT88pw3+
-x7Cwd7SsuxlIOOCIJssFnUhA9Qsq2wE=
-=qCzy
------END PGP PRIVATE KEY BLOCK-----
-EOF
-			public_key = <<EOF
------BEGIN PGP PUBLIC KEY BLOCK-----
-mDMEYYU7tRYJKwYBBAHaRw8BAQdAZ8vVdEyrWGssb7cdreG5GDGv6taHX/vWQdDG
-jn7zib+0KkNocmlzdGlhbiBCb25naW9ybm8gPGNocmlzdGlhbmJAamZyb2cuY29t
-PoiaBBMWCgBCFiEEksPI7fvaXVQtxrbOwL80hJIR2yQFAmGFO7UCGwMFCQPCZwAF
-CwkIBwIDIgIBBhUKCQgLAgQWAgMBAh4HAheAAAoJEMC/NISSEdskUA4A/19bf4Vv
-frl3UmOfRTgpYUMP7QM02Iw1viiymnWCd0QCAQCw+d64+xJ617Eqr/Vao95iezt/
-Hl7udD+e7Q/BK6RzA7g4BGGFO7USCisGAQQBl1UBBQEBB0An0/o1x1ZLJRgCalWn
-6HljvDcM/6Dz8zQyWxDgErDEXAMBCAeIeAQYFgoAIBYhBJLDyO372l1ULca2zsC/
-NISSEdskBQJhhTu1AhsMAAoJEMC/NISSEdsk1H8BAJCMZaWOY/yliPqiE/xs7BUH
-hUTmrGN19ZC8EJQDQsXCAQDEsZV5PzynDf7HsLB3tKy7GUg44IgmywWdSED1Cyrb
-AQ==
-=2kMe
------END PGP PUBLIC KEY BLOCK-----
-EOF
-			lifecycle {
-				ignore_changes = [
-					private_key,
-					passphrase,
-				]
-			}
-		}
-
-		resource "artifactory_keypair" "{{ .kp_name2 }}" {
-			pair_name  = "{{ .kp_name2 }}"
-			pair_type = "GPG"
-			alias = "foo-alias{{ .kp_id2 }}"
-			private_key = <<EOF
------BEGIN PGP PRIVATE KEY BLOCK-----
-lIYEYYU7tRYJKwYBBAHaRw8BAQdAZ8vVdEyrWGssb7cdreG5GDGv6taHX/vWQdDG
-jn7zib/+BwMCFjb4odY28+n0NWj7KZ53BkA0qzzqT9IpIfsW/tLNPTxYEFrDVbcF
-1CuiAgAhyUfBEr9HQaMJBLfIIvo/B3nlWvwWHkiQFuWpsnJ2pj8F8LQqQ2hyaXN0
-aWFuIEJvbmdpb3JubyA8Y2hyaXN0aWFuYkBqZnJvZy5jb20+iJoEExYKAEIWIQSS
-w8jt+9pdVC3Gts7AvzSEkhHbJAUCYYU7tQIbAwUJA8JnAAULCQgHAgMiAgEGFQoJ
-CAsCBBYCAwECHgcCF4AACgkQwL80hJIR2yRQDgD/X1t/hW9+uXdSY59FOClhQw/t
-AzTYjDW+KLKadYJ3RAIBALD53rj7EnrXsSqv9Vqj3mJ7O38eXu50P57tD8ErpHMD
-nIsEYYU7tRIKKwYBBAGXVQEFAQEHQCfT+jXHVkslGAJqVafoeWO8Nwz/oPPzNDJb
-EOASsMRcAwEIB/4HAwK+Wi8OaidLuvQ6yknLUspoRL8KJlQu0JkfLxj6Wl6GrRtf
-MdUBxaGUQX5UzMIqyYstgHKz2kBYvrJijWdOkkRuL82FySSh4yi/97FBikOBiHgE
-GBYKACAWIQSSw8jt+9pdVC3Gts7AvzSEkhHbJAUCYYU7tQIbDAAKCRDAvzSEkhHb
-JNR/AQCQjGWljmP8pYj6ohP8bOwVB4VE5qxjdfWQvBCUA0LFwgEAxLGVeT88pw3+
-x7Cwd7SsuxlIOOCIJssFnUhA9Qsq2wE=
-=qCzy
------END PGP PRIVATE KEY BLOCK-----
-EOF
-			public_key = <<EOF
------BEGIN PGP PUBLIC KEY BLOCK-----
-mDMEYYU7tRYJKwYBBAHaRw8BAQdAZ8vVdEyrWGssb7cdreG5GDGv6taHX/vWQdDG
-jn7zib+0KkNocmlzdGlhbiBCb25naW9ybm8gPGNocmlzdGlhbmJAamZyb2cuY29t
-PoiaBBMWCgBCFiEEksPI7fvaXVQtxrbOwL80hJIR2yQFAmGFO7UCGwMFCQPCZwAF
-CwkIBwIDIgIBBhUKCQgLAgQWAgMBAh4HAheAAAoJEMC/NISSEdskUA4A/19bf4Vv
-frl3UmOfRTgpYUMP7QM02Iw1viiymnWCd0QCAQCw+d64+xJ617Eqr/Vao95iezt/
-Hl7udD+e7Q/BK6RzA7g4BGGFO7USCisGAQQBl1UBBQEBB0An0/o1x1ZLJRgCalWn
-6HljvDcM/6Dz8zQyWxDgErDEXAMBCAeIeAQYFgoAIBYhBJLDyO372l1ULca2zsC/
-NISSEdskBQJhhTu1AhsMAAoJEMC/NISSEdsk1H8BAJCMZaWOY/yliPqiE/xs7BUH
-hUTmrGN19ZC8EJQDQsXCAQDEsZV5PzynDf7HsLB3tKy7GUg44IgmywWdSED1Cyrb
-AQ==
-=2kMe
------END PGP PUBLIC KEY BLOCK-----
-EOF
-			lifecycle {
-				ignore_changes = [
-					private_key,
-					passphrase,
-				]
-			}
-		}
-
-		resource "artifactory_local_rpm_repository" "{{ .repo_name }}" {
-			key 	     = "{{ .repo_name }}"
-			primary_keypair_ref = artifactory_keypair.{{ .kp_name }}.pair_name
-			secondary_keypair_ref = artifactory_keypair.{{ .kp_name2 }}.pair_name
-			yum_root_depth = 1
-			enable_file_lists_indexing = true
-			calculate_yum_metadata = true
-			depends_on = [
-				artifactory_keypair.{{ .kp_name }},
-				artifactory_keypair.{{ .kp_name2 }},
-			]
-		}
-	`, map[string]interface{}{
-		"kp_id":     kpId,
-		"kp_name":   kpName,
-		"kp_id2":    kpId2,
-		"kp_name2":  kpName2,
-		"repo_name": name,
-	}) // we use randomness so that, in the case of failure and dangle, the next test can run without collision
-
-	resource.Test(t, resource.TestCase{
-		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV6ProviderFactories: acctest.ProtoV6MuxProviderFactories,
-		CheckDestroy: acctest.CompositeCheckDestroy(
-			acctest.VerifyDeleted(t, fqrn, "", acctest.CheckRepo),
-			acctest.VerifyDeleted(t, kpFqrn, "pair_name", security.VerifyKeyPair),
-			acctest.VerifyDeleted(t, kpFqrn2, "pair_name", security.VerifyKeyPair),
-		),
-		Steps: []resource.TestStep{
-			{
-				Config: localRepositoryBasic,
-				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttr(fqrn, "key", name),
-					resource.TestCheckResourceAttr(fqrn, "package_type", "rpm"),
-					resource.TestCheckResourceAttr(fqrn, "primary_keypair_ref", kpName),
-					resource.TestCheckResourceAttr(fqrn, "secondary_keypair_ref", kpName2),
-					resource.TestCheckResourceAttr(fqrn, "enable_file_lists_indexing", "true"),
-					resource.TestCheckResourceAttr(fqrn, "calculate_yum_metadata", "true"),
-					resource.TestCheckResourceAttr(fqrn, "yum_root_depth", "1"),
-					resource.TestCheckResourceAttr(fqrn, "repo_layout_ref", func() string { r, _ := repository.GetDefaultRepoLayoutRef("local", "rpm"); return r }()), //Check to ensure repository layout is set as per default even when it is not passed.
-				),
-			},
-			{
-				ResourceName:      fqrn,
-				ImportState:       true,
-				ImportStateVerify: true,
-				ImportStateCheck:  validator.CheckImportState(name, "key"),
-			},
-		},
-	})
-}
-
-func TestAccLocalHelmOciRepository(t *testing.T) {
-	_, fqrn, name := testutil.MkNames("helmoci-local", "artifactory_local_helmoci_repository")
-	params := map[string]interface{}{
-		"retention": testutil.RandSelect(1, 5, 10),
-		"max_tags":  testutil.RandSelect(0, 5, 10),
-		"name":      name,
-	}
-	localRepositoryBasic := util.ExecuteTemplate("TestAccLocalHelmOciRepository", `
-		resource "artifactory_local_helmoci_repository" "{{ .name }}" {
-			key 	     = "{{ .name }}"
-			tag_retention = {{ .retention }}
-			max_unique_tags = {{ .max_tags }}
-		}
-	`, params)
-
-	resource.Test(t, resource.TestCase{
-		PreCheck:          func() { acctest.PreCheck(t) },
-		ProviderFactories: acctest.ProviderFactories,
-		CheckDestroy:      acctest.VerifyDeleted(t, fqrn, "", acctest.CheckRepo),
-		Steps: []resource.TestStep{
-			{
-				Config: localRepositoryBasic,
-				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttr(fqrn, "key", name),
-					resource.TestCheckResourceAttr(fqrn, "tag_retention", fmt.Sprintf("%d", params["retention"])),
-					resource.TestCheckResourceAttr(fqrn, "max_unique_tags", fmt.Sprintf("%d", params["max_tags"])),
-					resource.TestCheckResourceAttr(fqrn, "repo_layout_ref", func() string { r, _ := repository.GetDefaultRepoLayoutRef("local", "helmoci"); return r }()), //Check to ensure repository layout is set as per default even when it is not passed.
-				),
-			},
-			{
-				ResourceName:      fqrn,
-				ImportState:       true,
-				ImportStateVerify: true,
-				ImportStateCheck:  validator.CheckImportState(name, "key"),
-			},
-		},
-	})
-}
-
-func TestAccLocalHuggingFaceMLRepository(t *testing.T) {
-	_, fqrn, name := testutil.MkNames("huggingfaceml-local", "artifactory_local_huggingfaceml_repository")
-
-	params := map[string]interface{}{
-		"name":                     name,
-		"blacked_out":              testutil.RandBool(),
-		"xray_index":               testutil.RandBool(),
-		"property_set":             "artifactory",
-		"archive_browsing_enabled": testutil.RandBool(),
-	}
-	localRepositoryBasic := util.ExecuteTemplate("TestAccLocalHuggingFaceMLRepository", `
-		resource "artifactory_local_huggingfaceml_repository" "{{ .name }}" {
-		  key                      = "{{ .name }}"
-		  blacked_out              = {{ .blacked_out }}
-		  xray_index               = {{ .xray_index }}
-		  property_sets            = ["{{ .property_set }}"]
-		  archive_browsing_enabled = {{ .archive_browsing_enabled }}
-		}
-	`, params)
-
-	resource.Test(t, resource.TestCase{
-		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV6ProviderFactories: acctest.ProtoV6ProviderFactories,
-		CheckDestroy:             acctest.VerifyDeleted(t, fqrn, "key", acctest.CheckRepo),
-		Steps: []resource.TestStep{
-			{
-				Config: localRepositoryBasic,
-				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttr(fqrn, "key", name),
-					resource.TestCheckResourceAttr(fqrn, "blacked_out", strconv.FormatBool(params["blacked_out"].(bool))),
-					resource.TestCheckResourceAttr(fqrn, "xray_index", strconv.FormatBool(params["xray_index"].(bool))),
-					resource.TestCheckResourceAttr(fqrn, "property_sets.#", "1"),
-					resource.TestCheckResourceAttr(fqrn, "property_sets.0", params["property_set"].(string)),
-					resource.TestCheckResourceAttr(fqrn, "archive_browsing_enabled", strconv.FormatBool(params["archive_browsing_enabled"].(bool))),
-					resource.TestCheckResourceAttr(fqrn, "repo_layout_ref", func() string {
-						r, _ := repository.GetDefaultRepoLayoutRef("local", "huggingfaceml")
-						return r
-					}()), //Check to ensure repository layout is set as per default even when it is not passed.
-				),
-			},
-			{
-				ResourceName:                         fqrn,
-				ImportState:                          true,
-				ImportStateId:                        name,
-				ImportStateVerify:                    true,
-				ImportStateVerifyIdentifierAttribute: "key",
-			},
-		},
-	})
-}
-
-func TestAccLocalNugetRepository(t *testing.T) {
-	_, fqrn, name := testutil.MkNames("nuget-local", "artifactory_local_nuget_repository")
-	params := map[string]interface{}{
-		"force_nuget_authentication": testutil.RandBool(),
-		"max_unique_snapshots":       testutil.RandSelect(0, 5, 10),
-		"name":                       name,
-	}
-	localRepositoryBasic := util.ExecuteTemplate("TestAccLocalNugetRepository", `
-		resource "artifactory_local_nuget_repository" "{{ .name }}" {
-		  key                 = "{{ .name }}"
-		  max_unique_snapshots = {{ .max_unique_snapshots }}
-		  force_nuget_authentication = {{ .force_nuget_authentication }}
-		}
-	`, params)
-
-	resource.Test(t, resource.TestCase{
-		PreCheck:          func() { acctest.PreCheck(t) },
-		ProviderFactories: acctest.ProviderFactories,
-		CheckDestroy:      acctest.VerifyDeleted(t, fqrn, "", acctest.CheckRepo),
-		Steps: []resource.TestStep{
-			{
-				Config: localRepositoryBasic,
-				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttr(fqrn, "key", name),
-					resource.TestCheckResourceAttr(fqrn, "max_unique_snapshots", fmt.Sprintf("%d", params["max_unique_snapshots"])),
-					resource.TestCheckResourceAttr(fqrn, "force_nuget_authentication", fmt.Sprintf("%t", params["force_nuget_authentication"])),
-					resource.TestCheckResourceAttr(fqrn, "repo_layout_ref", func() string { r, _ := repository.GetDefaultRepoLayoutRef("local", "nuget"); return r }()), //Check to ensure repository layout is set as per default even when it is not passed.
-				),
-			},
-			{
-				ResourceName:      fqrn,
-				ImportState:       true,
-				ImportStateVerify: true,
-				ImportStateCheck:  validator.CheckImportState(name, "key"),
-			},
-		},
-	})
-}
-
-func TestAccLocalOciRepository(t *testing.T) {
-	_, fqrn, name := testutil.MkNames("oci-local", "artifactory_local_oci_repository")
-	params := map[string]interface{}{
-		"retention": testutil.RandSelect(1, 5, 10),
-		"max_tags":  testutil.RandSelect(0, 5, 10),
-		"name":      name,
-	}
-
-	config := util.ExecuteTemplate("TestAccLocalOciRepository", `
-		resource "artifactory_local_oci_repository" "{{ .name }}" {
-			key 	        = "{{ .name }}"
-			tag_retention   = {{ .retention }}
-			max_unique_tags = {{ .max_tags }}
-		}
-	`, params)
-
-	updatedParams := map[string]interface{}{
-		"retention": testutil.RandSelect(1, 5, 10),
-		"max_tags":  testutil.RandSelect(0, 5, 10),
-		"name":      name,
-	}
-	updatedConfig := util.ExecuteTemplate("TestAccLocalOciRepository", `
-		resource "artifactory_local_oci_repository" "{{ .name }}" {
-			key 	        = "{{ .name }}"
-			tag_retention   = {{ .retention }}
-			max_unique_tags = {{ .max_tags }}
-		}
-	`, updatedParams)
-
-	resource.Test(t, resource.TestCase{
-		PreCheck:          func() { acctest.PreCheck(t) },
-		ProviderFactories: acctest.ProviderFactories,
-		CheckDestroy:      acctest.VerifyDeleted(t, fqrn, "", acctest.CheckRepo),
-		Steps: []resource.TestStep{
-			{
-				Config: config,
-				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttr(fqrn, "key", name),
-					resource.TestCheckResourceAttr(fqrn, "tag_retention", fmt.Sprintf("%d", params["retention"])),
-					resource.TestCheckResourceAttr(fqrn, "max_unique_tags", fmt.Sprintf("%d", params["max_tags"])),
-					resource.TestCheckResourceAttr(fqrn, "repo_layout_ref", func() string { r, _ := repository.GetDefaultRepoLayoutRef("local", "oci"); return r }()), //Check to ensure repository layout is set as per default even when it is not passed.
-				),
-			},
-			{
-				Config: updatedConfig,
-				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttr(fqrn, "key", name),
-					resource.TestCheckResourceAttr(fqrn, "tag_retention", fmt.Sprintf("%d", updatedParams["retention"])),
-					resource.TestCheckResourceAttr(fqrn, "max_unique_tags", fmt.Sprintf("%d", updatedParams["max_tags"])),
-					resource.TestCheckResourceAttr(fqrn, "repo_layout_ref", func() string { r, _ := repository.GetDefaultRepoLayoutRef("local", "oci"); return r }()), //Check to ensure repository layout is set as per default even when it is not passed.
-				),
-			},
-			{
-				ResourceName:      fqrn,
-				ImportState:       true,
-				ImportStateVerify: true,
-				ImportStateCheck:  validator.CheckImportState(name, "key"),
-			},
-		},
-	})
-}
-
-func TestAccLocalTerraformModuleRepository(t *testing.T) {
-	_, fqrn, name := testutil.MkNames("terraform-local", "artifactory_local_terraform_module_repository")
-	params := map[string]interface{}{
-		"name": name,
-	}
-	localRepositoryBasic := util.ExecuteTemplate(
-		"TestAccLocalTerraformModuleRepository",
-		`resource "artifactory_local_terraform_module_repository" "{{ .name }}" {
-		  key            = "{{ .name }}"
-		}`,
-		params,
-	)
-
-	resource.Test(t, resource.TestCase{
-		PreCheck:          func() { acctest.PreCheck(t) },
-		ProviderFactories: acctest.ProviderFactories,
-		CheckDestroy:      acctest.VerifyDeleted(t, fqrn, "", acctest.CheckRepo),
-		Steps: []resource.TestStep{
-			{
-				Config: localRepositoryBasic,
-				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttr(fqrn, "key", name),
-					resource.TestCheckResourceAttr(fqrn, "package_type", "terraform"),
-					resource.TestCheckResourceAttr(fqrn, "repo_layout_ref", "terraform-module-default"),
-				),
-			},
-			{
-				ResourceName:      fqrn,
-				ImportState:       true,
-				ImportStateVerify: true,
-				ImportStateCheck:  validator.CheckImportState(name, "key"),
-			},
-		},
-	})
-}
-
-func TestAccLocalTerraformProviderRepository(t *testing.T) {
-	_, fqrn, name := testutil.MkNames("terraform-local", "artifactory_local_terraform_provider_repository")
-	params := map[string]interface{}{
-		"name": name,
-	}
-	localRepositoryBasic := util.ExecuteTemplate(
-		"TestAccLocalTerraformProviderRepository",
-		`resource "artifactory_local_terraform_provider_repository" "{{ .name }}" {
-		  key            = "{{ .name }}"
-		}`,
-		params,
-	)
-
-	resource.Test(t, resource.TestCase{
-		PreCheck:          func() { acctest.PreCheck(t) },
-		ProviderFactories: acctest.ProviderFactories,
-		CheckDestroy:      acctest.VerifyDeleted(t, fqrn, "", acctest.CheckRepo),
-		Steps: []resource.TestStep{
-			{
-				Config: localRepositoryBasic,
-				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttr(fqrn, "key", name),
-					resource.TestCheckResourceAttr(fqrn, "package_type", "terraform"),
-					resource.TestCheckResourceAttr(fqrn, "repo_layout_ref", "terraform-provider-default"),
-				),
-			},
-			{
-				ResourceName:      fqrn,
-				ImportState:       true,
-				ImportStateVerify: true,
-				ImportStateCheck:  validator.CheckImportState(name, "key"),
-			},
-		},
-	})
-}
-
-var commonJavaParams = map[string]interface{}{
-	"name":                            "",
-	"checksum_policy_type":            testutil.RandSelect("client-checksums", "server-generated-checksums"),
-	"snapshot_version_behavior":       testutil.RandSelect("unique", "non-unique", "deployer"),
-	"max_unique_snapshots":            testutil.RandSelect(0, 5, 10),
-	"handle_releases":                 true,
-	"handle_snapshots":                true,
-	"suppress_pom_consistency_checks": false,
-}
-
-const localJavaRepositoryBasic = `
-		resource "{{ .resource_name }}" "{{ .name }}" {
-		  key                 			  = "{{ .name }}"
-		  checksum_policy_type            = "{{ .checksum_policy_type }}"
-		  snapshot_version_behavior       = "{{ .snapshot_version_behavior }}"
-		  max_unique_snapshots            = {{ .max_unique_snapshots }}
-		  handle_releases                 = {{ .handle_releases }}
-		  handle_snapshots                = {{ .handle_snapshots }}
-		  suppress_pom_consistency_checks = {{ .suppress_pom_consistency_checks }}
-		}
-	`
-
-func TestAccLocalMavenRepository(t *testing.T) {
-	_, fqrn, name := testutil.MkNames("maven-local", "artifactory_local_maven_repository")
-	tempStruct := utilsdk.MergeMaps(commonJavaParams)
-
-	tempStruct["name"] = name
-	tempStruct["resource_name"] = strings.Split(fqrn, ".")[0]
-	tempStruct["suppress_pom_consistency_checks"] = false
-
-	resource.Test(t, resource.TestCase{
-		PreCheck:          func() { acctest.PreCheck(t) },
-		ProviderFactories: acctest.ProviderFactories,
-		CheckDestroy:      acctest.VerifyDeleted(t, fqrn, "", acctest.CheckRepo),
-		Steps: []resource.TestStep{
-			{
-				Config: util.ExecuteTemplate(fqrn, localJavaRepositoryBasic, tempStruct),
-				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttr(fqrn, "key", name),
-					resource.TestCheckResourceAttr(fqrn, "checksum_policy_type", fmt.Sprintf("%s", tempStruct["checksum_policy_type"])),
-					resource.TestCheckResourceAttr(fqrn, "snapshot_version_behavior", fmt.Sprintf("%s", tempStruct["snapshot_version_behavior"])),
-					resource.TestCheckResourceAttr(fqrn, "max_unique_snapshots", fmt.Sprintf("%d", tempStruct["max_unique_snapshots"])),
-					resource.TestCheckResourceAttr(fqrn, "handle_releases", fmt.Sprintf("%v", tempStruct["handle_releases"])),
-					resource.TestCheckResourceAttr(fqrn, "handle_snapshots", fmt.Sprintf("%v", tempStruct["handle_snapshots"])),
-					resource.TestCheckResourceAttr(fqrn, "suppress_pom_consistency_checks", fmt.Sprintf("%v", tempStruct["suppress_pom_consistency_checks"])),
-					resource.TestCheckResourceAttr(fqrn, "repo_layout_ref", func() string { r, _ := repository.GetDefaultRepoLayoutRef("local", "maven"); return r }()), //Check to ensure repository layout is set as per default even when it is not passed.
-				),
-			},
-			{
-				ResourceName:      fqrn,
-				ImportState:       true,
-				ImportStateVerify: true,
-				ImportStateCheck:  validator.CheckImportState(name, "key"),
-			},
-		},
-	})
-}
-
-func TestAccLocalNpmRepository(t *testing.T) {
-	_, fqrn, name := testutil.MkNames("npm-local", "artifactory_local_npm_repository")
-	params := map[string]interface{}{
-		"name": name,
-	}
-	localRepositoryBasic := util.ExecuteTemplate("TestAccLocalNpmRepository", `
-		resource "artifactory_local_npm_repository" "{{ .name }}" {
-		  key                 = "{{ .name }}"
-		}
-	`, params)
-
-	resource.Test(t, resource.TestCase{
-		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV6ProviderFactories: acctest.ProtoV6ProviderFactories,
-		CheckDestroy:             acctest.VerifyDeleted(t, fqrn, "key", acctest.CheckRepo),
-		Steps: []resource.TestStep{
-			{
-				Config: localRepositoryBasic,
-				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttr(fqrn, "key", name),
-				),
-			},
-			{
-				ResourceName:                         fqrn,
-				ImportState:                          true,
-				ImportStateId:                        name,
-				ImportStateVerify:                    true,
-				ImportStateVerifyIdentifierAttribute: "key",
-			},
-		},
-	})
-}
-
-func makeLocalGradleLikeRepoTestCase(repoType string, t *testing.T) (*testing.T, resource.TestCase) {
-	name := fmt.Sprintf("%s-local", repoType)
-	resourceName := fmt.Sprintf("artifactory_local_%s_repository", repoType)
-	_, fqrn, name := testutil.MkNames(name, resourceName)
-	tempStruct := utilsdk.MergeMaps(commonJavaParams)
-
-	tempStruct["name"] = name
-	tempStruct["resource_name"] = strings.Split(fqrn, ".")[0]
-	tempStruct["suppress_pom_consistency_checks"] = true
-
-	return t, resource.TestCase{
-		PreCheck:          func() { acctest.PreCheck(t) },
-		ProviderFactories: acctest.ProviderFactories,
-		CheckDestroy:      acctest.VerifyDeleted(t, fqrn, "", acctest.CheckRepo),
-		Steps: []resource.TestStep{
-			{
-				Config: util.ExecuteTemplate(fqrn, localJavaRepositoryBasic, tempStruct),
-				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttr(fqrn, "key", name),
-					resource.TestCheckResourceAttr(fqrn, "checksum_policy_type", fmt.Sprintf("%s", tempStruct["checksum_policy_type"])),
-					resource.TestCheckResourceAttr(fqrn, "snapshot_version_behavior", fmt.Sprintf("%s", tempStruct["snapshot_version_behavior"])),
-					resource.TestCheckResourceAttr(fqrn, "max_unique_snapshots", fmt.Sprintf("%d", tempStruct["max_unique_snapshots"])),
-					resource.TestCheckResourceAttr(fqrn, "handle_releases", fmt.Sprintf("%v", tempStruct["handle_releases"])),
-					resource.TestCheckResourceAttr(fqrn, "handle_snapshots", fmt.Sprintf("%v", tempStruct["handle_snapshots"])),
-					resource.TestCheckResourceAttr(fqrn, "suppress_pom_consistency_checks", fmt.Sprintf("%v", tempStruct["suppress_pom_consistency_checks"])),
-				),
-			},
-			{
-				ResourceName:      fqrn,
-				ImportState:       true,
-				ImportStateVerify: true,
-				ImportStateCheck:  validator.CheckImportState(name, "key"),
-			},
-		},
-	}
-}
-
-func TestAccAllGradleLikeLocalRepoTypes(t *testing.T) {
-	for _, packageType := range repository.PackageTypesLikeGradle {
-		t.Run(packageType, func(t *testing.T) {
-			resource.Test(makeLocalGradleLikeRepoTestCase(packageType, t))
-		})
-	}
-}
diff --git a/pkg/artifactory/resource/repository/local/resource_artifactory_local_rpm_repository.go b/pkg/artifactory/resource/repository/local/resource_artifactory_local_rpm_repository.go
index 6588c9e9..0dc2cf73 100644
--- a/pkg/artifactory/resource/repository/local/resource_artifactory_local_rpm_repository.go
+++ b/pkg/artifactory/resource/repository/local/resource_artifactory_local_rpm_repository.go
@@ -1,20 +1,193 @@
 package local
 
 import (
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"context"
+	"reflect"
+	"regexp"
+
+	"github.com/hashicorp/terraform-plugin-framework-validators/int64validator"
+	"github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator"
+	"github.com/hashicorp/terraform-plugin-framework/diag"
+	"github.com/hashicorp/terraform-plugin-framework/resource"
+	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
+	"github.com/hashicorp/terraform-plugin-framework/resource/schema/booldefault"
+	"github.com/hashicorp/terraform-plugin-framework/resource/schema/int64default"
+	"github.com/hashicorp/terraform-plugin-framework/resource/schema/stringdefault"
+	"github.com/hashicorp/terraform-plugin-framework/schema/validator"
+	"github.com/hashicorp/terraform-plugin-framework/types"
+	sdkv2_schema "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/artifactory/resource/repository"
-	"github.com/jfrog/terraform-provider-shared/packer"
 	utilsdk "github.com/jfrog/terraform-provider-shared/util/sdk"
-	"github.com/jfrog/terraform-provider-shared/validator"
+	sdkv2_validator "github.com/jfrog/terraform-provider-shared/validator"
+	"github.com/samber/lo"
 )
 
+func NewRPMLocalRepositoryResource() resource.Resource {
+	return &localRPMResource{
+		localResource: NewLocalRepositoryResource(
+			repository.RPMPackageType,
+			"RPM",
+			reflect.TypeFor[LocalRPMResourceModel](),
+			reflect.TypeFor[LocalRPMAPIModel](),
+		),
+	}
+}
+
+type localRPMResource struct {
+	localResource
+}
+
+type LocalRPMResourceModel struct {
+	LocalResourceModel
+	PrimaryKeyPairRef       types.String `tfsdk:"primary_keypair_ref"`
+	SecondaryKeyPairRef     types.String `tfsdk:"secondary_keypair_ref"`
+	RootDepth               types.Int64  `tfsdk:"yum_root_depth"`
+	CalculateYumMetadata    types.Bool   `tfsdk:"calculate_yum_metadata"`
+	EnableFileListsIndexing types.Bool   `tfsdk:"enable_file_lists_indexing"`
+	GroupFileNames          types.String `tfsdk:"yum_group_file_names"`
+}
+
+func (r *LocalRPMResourceModel) GetCreateResourcePlanData(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) {
+	// Read Terraform plan data into the model
+	resp.Diagnostics.Append(req.Plan.Get(ctx, r)...)
+}
+
+func (r LocalRPMResourceModel) SetCreateResourceStateData(ctx context.Context, resp *resource.CreateResponse) {
+	// Save data into Terraform state
+	resp.Diagnostics.Append(resp.State.Set(ctx, &r)...)
+}
+
+func (r *LocalRPMResourceModel) GetReadResourceStateData(ctx context.Context, req resource.ReadRequest, resp *resource.ReadResponse) {
+	// Read Terraform state data into the model
+	resp.Diagnostics.Append(req.State.Get(ctx, r)...)
+}
+
+func (r LocalRPMResourceModel) SetReadResourceStateData(ctx context.Context, resp *resource.ReadResponse) {
+	// Save data into Terraform state
+	resp.Diagnostics.Append(resp.State.Set(ctx, &r)...)
+}
+
+func (r *LocalRPMResourceModel) GetUpdateResourcePlanData(ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse) {
+	// Read Terraform state data into the model
+	resp.Diagnostics.Append(req.Plan.Get(ctx, r)...)
+}
+
+func (r *LocalRPMResourceModel) GetUpdateResourceStateData(ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse) {
+	// Read Terraform state data into the model
+	resp.Diagnostics.Append(req.State.Get(ctx, r)...)
+}
+
+func (r LocalRPMResourceModel) SetUpdateResourceStateData(ctx context.Context, resp *resource.UpdateResponse) {
+	// Save data into Terraform state
+	resp.Diagnostics.Append(resp.State.Set(ctx, &r)...)
+}
+
+func (r LocalRPMResourceModel) ToAPIModel(ctx context.Context, packageType string) (interface{}, diag.Diagnostics) {
+	diags := diag.Diagnostics{}
+
+	model, d := r.LocalResourceModel.ToAPIModel(ctx, packageType)
+	if d != nil {
+		diags.Append(d...)
+	}
+
+	localAPIModel := model.(LocalAPIModel)
+	localAPIModel.RepoLayoutRef = r.RepoLayoutRef.ValueString()
+
+	return LocalRPMAPIModel{
+		LocalAPIModel:           localAPIModel,
+		PrimaryKeyPairRef:       r.PrimaryKeyPairRef.ValueString(),
+		SecondaryKeyPairRef:     r.SecondaryKeyPairRef.ValueString(),
+		RootDepth:               r.RootDepth.ValueInt64(),
+		CalculateYumMetadata:    r.CalculateYumMetadata.ValueBool(),
+		EnableFileListsIndexing: r.EnableFileListsIndexing.ValueBool(),
+		GroupFileNames:          r.GroupFileNames.ValueString(),
+	}, diags
+}
+
+func (r *LocalRPMResourceModel) FromAPIModel(ctx context.Context, apiModel interface{}) diag.Diagnostics {
+	diags := diag.Diagnostics{}
+
+	model := apiModel.(*LocalRPMAPIModel)
+
+	r.LocalResourceModel.FromAPIModel(ctx, model.LocalAPIModel)
+
+	r.RepoLayoutRef = types.StringValue(model.RepoLayoutRef)
+	r.PrimaryKeyPairRef = types.StringValue(model.PrimaryKeyPairRef)
+	r.SecondaryKeyPairRef = types.StringValue(model.SecondaryKeyPairRef)
+	r.RootDepth = types.Int64Value(model.RootDepth)
+	r.CalculateYumMetadata = types.BoolValue(model.CalculateYumMetadata)
+	r.EnableFileListsIndexing = types.BoolValue(model.EnableFileListsIndexing)
+	r.GroupFileNames = types.StringValue(model.GroupFileNames)
+
+	return diags
+}
+
+type LocalRPMAPIModel struct {
+	LocalAPIModel
+	PrimaryKeyPairRef       string `json:"primaryKeyPairRef"`
+	SecondaryKeyPairRef     string `json:"secondaryKeyPairRef"`
+	RootDepth               int64  `json:"yumRootDepth"`
+	CalculateYumMetadata    bool   `json:"calculateYumMetadata"`
+	EnableFileListsIndexing bool   `json:"enableFileListsIndexing"`
+	GroupFileNames          string `json:"yumGroupFileNames"`
+}
+
+func (r *localRPMResource) Schema(ctx context.Context, req resource.SchemaRequest, resp *resource.SchemaResponse) {
+	attributes := lo.Assign(
+		LocalAttributes,
+		repository.RepoLayoutRefAttribute(r.Rclass, r.PackageType),
+		repository.PrimaryKeyPairRefAttribute,
+		repository.SecondaryKeyPairRefAttribute,
+		map[string]schema.Attribute{
+			"yum_root_depth": schema.Int64Attribute{
+				Optional: true,
+				Computed: true,
+				Default:  int64default.StaticInt64(0),
+				Validators: []validator.Int64{
+					int64validator.AtLeast(0),
+				},
+				MarkdownDescription: "The depth, relative to the repository's root folder, where RPM metadata is created. " +
+					"This is useful when your repository contains multiple RPM repositories under parallel hierarchies. " +
+					"For example, if your RPMs are stored under 'fedora/linux/$releasever/$basearch', specify a depth of 4.",
+			},
+			"calculate_yum_metadata": schema.BoolAttribute{
+				Optional: true,
+				Computed: true,
+				Default:  booldefault.StaticBool(false),
+			},
+			"enable_file_lists_indexing": schema.BoolAttribute{
+				Optional: true,
+				Computed: true,
+				Default:  booldefault.StaticBool(false),
+			},
+			"yum_group_file_names": schema.StringAttribute{
+				Optional: true,
+				Computed: true,
+				Default:  stringdefault.StaticString(""),
+				Validators: []validator.String{
+					stringvalidator.RegexMatches(regexp.MustCompile(`.+(?:,.+)*`), "must be comma separated string"),
+				},
+				MarkdownDescription: "A comma separated list of XML file names containing RPM group component definitions. Artifactory includes " +
+					"the group definitions as part of the calculated RPM metadata, as well as automatically generating a " +
+					"gzipped version of the group files, if required.",
+			},
+		},
+	)
+
+	resp.Schema = schema.Schema{
+		Version:     CurrentSchemaVersion,
+		Attributes:  attributes,
+		Description: r.Description,
+	}
+}
+
 var rpmSchema = utilsdk.MergeMaps(
 	repository.PrimaryKeyPairRefSDKv2,
 	repository.SecondaryKeyPairRefSDKv2,
-	map[string]*schema.Schema{
+	map[string]*sdkv2_schema.Schema{
 		"yum_root_depth": {
-			Type:             schema.TypeInt,
+			Type:             sdkv2_schema.TypeInt,
 			Optional:         true,
 			Default:          0,
 			ValidateDiagFunc: validation.ToDiagFunc(validation.IntAtLeast(0)),
@@ -23,20 +196,20 @@ var rpmSchema = utilsdk.MergeMaps(
 				"For example, if your RPMs are stored under 'fedora/linux/$releasever/$basearch', specify a depth of 4.",
 		},
 		"calculate_yum_metadata": {
-			Type:     schema.TypeBool,
+			Type:     sdkv2_schema.TypeBool,
 			Optional: true,
 			Default:  false,
 		},
 		"enable_file_lists_indexing": {
-			Type:     schema.TypeBool,
+			Type:     sdkv2_schema.TypeBool,
 			Optional: true,
 			Default:  false,
 		},
 		"yum_group_file_names": {
-			Type:             schema.TypeString,
+			Type:             sdkv2_schema.TypeString,
 			Optional:         true,
 			Default:          "",
-			ValidateDiagFunc: validator.CommaSeperatedList,
+			ValidateDiagFunc: sdkv2_validator.CommaSeperatedList,
 			Description: "A comma separated list of XML file names containing RPM group component definitions. Artifactory includes " +
 				"the group definitions as part of the calculated RPM metadata, as well as automatically generating a " +
 				"gzipped version of the group files, if required.",
@@ -56,47 +229,3 @@ type RpmLocalRepositoryParams struct {
 	EnableFileListsIndexing bool   `hcl:"enable_file_lists_indexing" json:"enableFileListsIndexing"`
 	GroupFileNames          string `hcl:"yum_group_file_names" json:"yumGroupFileNames"`
 }
-
-func UnpackLocalRpmRepository(data *schema.ResourceData, Rclass string) RpmLocalRepositoryParams {
-	d := &utilsdk.ResourceData{ResourceData: data}
-	return RpmLocalRepositoryParams{
-		RepositoryBaseParams: UnpackBaseRepo(Rclass, data, repository.RPMPackageType),
-		PrimaryKeyPairRefParam: repository.PrimaryKeyPairRefParam{
-			PrimaryKeyPairRefSDKv2: d.GetString("primary_keypair_ref", false),
-		},
-		SecondaryKeyPairRefParam: repository.SecondaryKeyPairRefParam{
-			SecondaryKeyPairRefSDKv2: d.GetString("secondary_keypair_ref", false),
-		},
-		RootDepth:               d.GetInt("yum_root_depth", false),
-		CalculateYumMetadata:    d.GetBool("calculate_yum_metadata", false),
-		EnableFileListsIndexing: d.GetBool("enable_file_lists_indexing", false),
-		GroupFileNames:          d.GetString("yum_group_file_names", false),
-	}
-}
-
-func ResourceArtifactoryLocalRpmRepository() *schema.Resource {
-	unpackLocalRpmRepository := func(data *schema.ResourceData) (interface{}, string, error) {
-		repo := UnpackLocalRpmRepository(data, Rclass)
-		return repo, repo.Id(), nil
-	}
-
-	constructor := func() (interface{}, error) {
-		return &RpmLocalRepositoryParams{
-			RepositoryBaseParams: RepositoryBaseParams{
-				PackageType: repository.RPMPackageType,
-				Rclass:      Rclass,
-			},
-			RootDepth:               0,
-			CalculateYumMetadata:    false,
-			EnableFileListsIndexing: false,
-			GroupFileNames:          "",
-		}, nil
-	}
-
-	return repository.MkResourceSchema(
-		RPMSchemas,
-		packer.Default(RPMSchemas[CurrentSchemaVersion]),
-		unpackLocalRpmRepository,
-		constructor,
-	)
-}
diff --git a/pkg/artifactory/resource/repository/local/resource_artifactory_local_rpm_repository_test.go b/pkg/artifactory/resource/repository/local/resource_artifactory_local_rpm_repository_test.go
new file mode 100644
index 00000000..34d4a41f
--- /dev/null
+++ b/pkg/artifactory/resource/repository/local/resource_artifactory_local_rpm_repository_test.go
@@ -0,0 +1,299 @@
+package local_test
+
+import (
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/plancheck"
+	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/acctest"
+	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/artifactory/resource/repository"
+	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/artifactory/resource/security"
+	"github.com/jfrog/terraform-provider-shared/testutil"
+	"github.com/jfrog/terraform-provider-shared/util"
+	"github.com/jfrog/terraform-provider-shared/validator"
+)
+
+func TestAccLocalRPMRepository(t *testing.T) {
+	_, fqrn, name := testutil.MkNames("local-rpm-repo", "artifactory_local_rpm_repository")
+	kpId, kpFqrn, kpName := testutil.MkNames("some-keypair1", "artifactory_keypair")
+	kpId2, kpFqrn2, kpName2 := testutil.MkNames("some-keypair2", "artifactory_keypair")
+
+	localRepositoryBasic := util.ExecuteTemplate("keypair", `
+		resource "artifactory_keypair" "{{ .kp_name }}" {
+			pair_name  = "{{ .kp_name }}"
+			pair_type = "GPG"
+			alias = "foo-alias{{ .kp_id }}"
+			private_key = <<EOF
+-----BEGIN PGP PRIVATE KEY BLOCK-----
+lIYEYYU7tRYJKwYBBAHaRw8BAQdAZ8vVdEyrWGssb7cdreG5GDGv6taHX/vWQdDG
+jn7zib/+BwMCFjb4odY28+n0NWj7KZ53BkA0qzzqT9IpIfsW/tLNPTxYEFrDVbcF
+1CuiAgAhyUfBEr9HQaMJBLfIIvo/B3nlWvwWHkiQFuWpsnJ2pj8F8LQqQ2hyaXN0
+aWFuIEJvbmdpb3JubyA8Y2hyaXN0aWFuYkBqZnJvZy5jb20+iJoEExYKAEIWIQSS
+w8jt+9pdVC3Gts7AvzSEkhHbJAUCYYU7tQIbAwUJA8JnAAULCQgHAgMiAgEGFQoJ
+CAsCBBYCAwECHgcCF4AACgkQwL80hJIR2yRQDgD/X1t/hW9+uXdSY59FOClhQw/t
+AzTYjDW+KLKadYJ3RAIBALD53rj7EnrXsSqv9Vqj3mJ7O38eXu50P57tD8ErpHMD
+nIsEYYU7tRIKKwYBBAGXVQEFAQEHQCfT+jXHVkslGAJqVafoeWO8Nwz/oPPzNDJb
+EOASsMRcAwEIB/4HAwK+Wi8OaidLuvQ6yknLUspoRL8KJlQu0JkfLxj6Wl6GrRtf
+MdUBxaGUQX5UzMIqyYstgHKz2kBYvrJijWdOkkRuL82FySSh4yi/97FBikOBiHgE
+GBYKACAWIQSSw8jt+9pdVC3Gts7AvzSEkhHbJAUCYYU7tQIbDAAKCRDAvzSEkhHb
+JNR/AQCQjGWljmP8pYj6ohP8bOwVB4VE5qxjdfWQvBCUA0LFwgEAxLGVeT88pw3+
+x7Cwd7SsuxlIOOCIJssFnUhA9Qsq2wE=
+=qCzy
+-----END PGP PRIVATE KEY BLOCK-----
+EOF
+			public_key = <<EOF
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+mDMEYYU7tRYJKwYBBAHaRw8BAQdAZ8vVdEyrWGssb7cdreG5GDGv6taHX/vWQdDG
+jn7zib+0KkNocmlzdGlhbiBCb25naW9ybm8gPGNocmlzdGlhbmJAamZyb2cuY29t
+PoiaBBMWCgBCFiEEksPI7fvaXVQtxrbOwL80hJIR2yQFAmGFO7UCGwMFCQPCZwAF
+CwkIBwIDIgIBBhUKCQgLAgQWAgMBAh4HAheAAAoJEMC/NISSEdskUA4A/19bf4Vv
+frl3UmOfRTgpYUMP7QM02Iw1viiymnWCd0QCAQCw+d64+xJ617Eqr/Vao95iezt/
+Hl7udD+e7Q/BK6RzA7g4BGGFO7USCisGAQQBl1UBBQEBB0An0/o1x1ZLJRgCalWn
+6HljvDcM/6Dz8zQyWxDgErDEXAMBCAeIeAQYFgoAIBYhBJLDyO372l1ULca2zsC/
+NISSEdskBQJhhTu1AhsMAAoJEMC/NISSEdsk1H8BAJCMZaWOY/yliPqiE/xs7BUH
+hUTmrGN19ZC8EJQDQsXCAQDEsZV5PzynDf7HsLB3tKy7GUg44IgmywWdSED1Cyrb
+AQ==
+=2kMe
+-----END PGP PUBLIC KEY BLOCK-----
+EOF
+			lifecycle {
+				ignore_changes = [
+					private_key,
+					passphrase,
+				]
+			}
+		}
+
+		resource "artifactory_keypair" "{{ .kp_name2 }}" {
+			pair_name  = "{{ .kp_name2 }}"
+			pair_type = "GPG"
+			alias = "foo-alias{{ .kp_id2 }}"
+			private_key = <<EOF
+-----BEGIN PGP PRIVATE KEY BLOCK-----
+lIYEYYU7tRYJKwYBBAHaRw8BAQdAZ8vVdEyrWGssb7cdreG5GDGv6taHX/vWQdDG
+jn7zib/+BwMCFjb4odY28+n0NWj7KZ53BkA0qzzqT9IpIfsW/tLNPTxYEFrDVbcF
+1CuiAgAhyUfBEr9HQaMJBLfIIvo/B3nlWvwWHkiQFuWpsnJ2pj8F8LQqQ2hyaXN0
+aWFuIEJvbmdpb3JubyA8Y2hyaXN0aWFuYkBqZnJvZy5jb20+iJoEExYKAEIWIQSS
+w8jt+9pdVC3Gts7AvzSEkhHbJAUCYYU7tQIbAwUJA8JnAAULCQgHAgMiAgEGFQoJ
+CAsCBBYCAwECHgcCF4AACgkQwL80hJIR2yRQDgD/X1t/hW9+uXdSY59FOClhQw/t
+AzTYjDW+KLKadYJ3RAIBALD53rj7EnrXsSqv9Vqj3mJ7O38eXu50P57tD8ErpHMD
+nIsEYYU7tRIKKwYBBAGXVQEFAQEHQCfT+jXHVkslGAJqVafoeWO8Nwz/oPPzNDJb
+EOASsMRcAwEIB/4HAwK+Wi8OaidLuvQ6yknLUspoRL8KJlQu0JkfLxj6Wl6GrRtf
+MdUBxaGUQX5UzMIqyYstgHKz2kBYvrJijWdOkkRuL82FySSh4yi/97FBikOBiHgE
+GBYKACAWIQSSw8jt+9pdVC3Gts7AvzSEkhHbJAUCYYU7tQIbDAAKCRDAvzSEkhHb
+JNR/AQCQjGWljmP8pYj6ohP8bOwVB4VE5qxjdfWQvBCUA0LFwgEAxLGVeT88pw3+
+x7Cwd7SsuxlIOOCIJssFnUhA9Qsq2wE=
+=qCzy
+-----END PGP PRIVATE KEY BLOCK-----
+EOF
+			public_key = <<EOF
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+mDMEYYU7tRYJKwYBBAHaRw8BAQdAZ8vVdEyrWGssb7cdreG5GDGv6taHX/vWQdDG
+jn7zib+0KkNocmlzdGlhbiBCb25naW9ybm8gPGNocmlzdGlhbmJAamZyb2cuY29t
+PoiaBBMWCgBCFiEEksPI7fvaXVQtxrbOwL80hJIR2yQFAmGFO7UCGwMFCQPCZwAF
+CwkIBwIDIgIBBhUKCQgLAgQWAgMBAh4HAheAAAoJEMC/NISSEdskUA4A/19bf4Vv
+frl3UmOfRTgpYUMP7QM02Iw1viiymnWCd0QCAQCw+d64+xJ617Eqr/Vao95iezt/
+Hl7udD+e7Q/BK6RzA7g4BGGFO7USCisGAQQBl1UBBQEBB0An0/o1x1ZLJRgCalWn
+6HljvDcM/6Dz8zQyWxDgErDEXAMBCAeIeAQYFgoAIBYhBJLDyO372l1ULca2zsC/
+NISSEdskBQJhhTu1AhsMAAoJEMC/NISSEdsk1H8BAJCMZaWOY/yliPqiE/xs7BUH
+hUTmrGN19ZC8EJQDQsXCAQDEsZV5PzynDf7HsLB3tKy7GUg44IgmywWdSED1Cyrb
+AQ==
+=2kMe
+-----END PGP PUBLIC KEY BLOCK-----
+EOF
+			lifecycle {
+				ignore_changes = [
+					private_key,
+					passphrase,
+				]
+			}
+		}
+
+		resource "artifactory_local_rpm_repository" "{{ .repo_name }}" {
+			key 	     = "{{ .repo_name }}"
+			primary_keypair_ref = artifactory_keypair.{{ .kp_name }}.pair_name
+			secondary_keypair_ref = artifactory_keypair.{{ .kp_name2 }}.pair_name
+			yum_root_depth = 1
+			enable_file_lists_indexing = true
+			calculate_yum_metadata = true
+		}
+	`, map[string]interface{}{
+		"kp_id":     kpId,
+		"kp_name":   kpName,
+		"kp_id2":    kpId2,
+		"kp_name2":  kpName2,
+		"repo_name": name,
+	}) // we use randomness so that, in the case of failure and dangle, the next test can run without collision
+
+	resource.Test(t, resource.TestCase{
+		ProtoV6ProviderFactories: acctest.ProtoV6ProviderFactories,
+		CheckDestroy: acctest.CompositeCheckDestroy(
+			acctest.VerifyDeleted(t, fqrn, "", acctest.CheckRepo),
+			acctest.VerifyDeleted(t, kpFqrn, "pair_name", security.VerifyKeyPair),
+			acctest.VerifyDeleted(t, kpFqrn2, "pair_name", security.VerifyKeyPair),
+		),
+		Steps: []resource.TestStep{
+			{
+				Config: localRepositoryBasic,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(fqrn, "key", name),
+					resource.TestCheckResourceAttr(fqrn, "primary_keypair_ref", kpName),
+					resource.TestCheckResourceAttr(fqrn, "secondary_keypair_ref", kpName2),
+					resource.TestCheckResourceAttr(fqrn, "enable_file_lists_indexing", "true"),
+					resource.TestCheckResourceAttr(fqrn, "calculate_yum_metadata", "true"),
+					resource.TestCheckResourceAttr(fqrn, "yum_root_depth", "1"),
+					resource.TestCheckResourceAttr(fqrn, "repo_layout_ref", func() string {
+						r, _ := repository.GetDefaultRepoLayoutRef("local", repository.RPMPackageType)
+						return r
+					}()), //Check to ensure repository layout is set as per default even when it is not passed.
+				),
+			},
+			{
+				ResourceName:      fqrn,
+				ImportState:       true,
+				ImportStateVerify: true,
+				ImportStateCheck:  validator.CheckImportState(name, "key"),
+			},
+		},
+	})
+}
+
+func TestAccLocalRPMRepository_UpgradeFromSDKv2(t *testing.T) {
+	_, fqrn, name := testutil.MkNames("local-rpm-repo", "artifactory_local_rpm_repository")
+	kpId, _, kpName := testutil.MkNames("some-keypair1", "artifactory_keypair")
+	kpId2, _, kpName2 := testutil.MkNames("some-keypair2", "artifactory_keypair")
+
+	config := util.ExecuteTemplate("keypair", `
+		resource "artifactory_keypair" "{{ .kp_name }}" {
+			pair_name  = "{{ .kp_name }}"
+			pair_type = "GPG"
+			alias = "foo-alias{{ .kp_id }}"
+			private_key = <<EOF
+-----BEGIN PGP PRIVATE KEY BLOCK-----
+lIYEYYU7tRYJKwYBBAHaRw8BAQdAZ8vVdEyrWGssb7cdreG5GDGv6taHX/vWQdDG
+jn7zib/+BwMCFjb4odY28+n0NWj7KZ53BkA0qzzqT9IpIfsW/tLNPTxYEFrDVbcF
+1CuiAgAhyUfBEr9HQaMJBLfIIvo/B3nlWvwWHkiQFuWpsnJ2pj8F8LQqQ2hyaXN0
+aWFuIEJvbmdpb3JubyA8Y2hyaXN0aWFuYkBqZnJvZy5jb20+iJoEExYKAEIWIQSS
+w8jt+9pdVC3Gts7AvzSEkhHbJAUCYYU7tQIbAwUJA8JnAAULCQgHAgMiAgEGFQoJ
+CAsCBBYCAwECHgcCF4AACgkQwL80hJIR2yRQDgD/X1t/hW9+uXdSY59FOClhQw/t
+AzTYjDW+KLKadYJ3RAIBALD53rj7EnrXsSqv9Vqj3mJ7O38eXu50P57tD8ErpHMD
+nIsEYYU7tRIKKwYBBAGXVQEFAQEHQCfT+jXHVkslGAJqVafoeWO8Nwz/oPPzNDJb
+EOASsMRcAwEIB/4HAwK+Wi8OaidLuvQ6yknLUspoRL8KJlQu0JkfLxj6Wl6GrRtf
+MdUBxaGUQX5UzMIqyYstgHKz2kBYvrJijWdOkkRuL82FySSh4yi/97FBikOBiHgE
+GBYKACAWIQSSw8jt+9pdVC3Gts7AvzSEkhHbJAUCYYU7tQIbDAAKCRDAvzSEkhHb
+JNR/AQCQjGWljmP8pYj6ohP8bOwVB4VE5qxjdfWQvBCUA0LFwgEAxLGVeT88pw3+
+x7Cwd7SsuxlIOOCIJssFnUhA9Qsq2wE=
+=qCzy
+-----END PGP PRIVATE KEY BLOCK-----
+EOF
+			public_key = <<EOF
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+mDMEYYU7tRYJKwYBBAHaRw8BAQdAZ8vVdEyrWGssb7cdreG5GDGv6taHX/vWQdDG
+jn7zib+0KkNocmlzdGlhbiBCb25naW9ybm8gPGNocmlzdGlhbmJAamZyb2cuY29t
+PoiaBBMWCgBCFiEEksPI7fvaXVQtxrbOwL80hJIR2yQFAmGFO7UCGwMFCQPCZwAF
+CwkIBwIDIgIBBhUKCQgLAgQWAgMBAh4HAheAAAoJEMC/NISSEdskUA4A/19bf4Vv
+frl3UmOfRTgpYUMP7QM02Iw1viiymnWCd0QCAQCw+d64+xJ617Eqr/Vao95iezt/
+Hl7udD+e7Q/BK6RzA7g4BGGFO7USCisGAQQBl1UBBQEBB0An0/o1x1ZLJRgCalWn
+6HljvDcM/6Dz8zQyWxDgErDEXAMBCAeIeAQYFgoAIBYhBJLDyO372l1ULca2zsC/
+NISSEdskBQJhhTu1AhsMAAoJEMC/NISSEdsk1H8BAJCMZaWOY/yliPqiE/xs7BUH
+hUTmrGN19ZC8EJQDQsXCAQDEsZV5PzynDf7HsLB3tKy7GUg44IgmywWdSED1Cyrb
+AQ==
+=2kMe
+-----END PGP PUBLIC KEY BLOCK-----
+EOF
+			lifecycle {
+				ignore_changes = [
+					private_key,
+					passphrase,
+				]
+			}
+		}
+
+		resource "artifactory_keypair" "{{ .kp_name2 }}" {
+			pair_name  = "{{ .kp_name2 }}"
+			pair_type = "GPG"
+			alias = "foo-alias{{ .kp_id2 }}"
+			private_key = <<EOF
+-----BEGIN PGP PRIVATE KEY BLOCK-----
+lIYEYYU7tRYJKwYBBAHaRw8BAQdAZ8vVdEyrWGssb7cdreG5GDGv6taHX/vWQdDG
+jn7zib/+BwMCFjb4odY28+n0NWj7KZ53BkA0qzzqT9IpIfsW/tLNPTxYEFrDVbcF
+1CuiAgAhyUfBEr9HQaMJBLfIIvo/B3nlWvwWHkiQFuWpsnJ2pj8F8LQqQ2hyaXN0
+aWFuIEJvbmdpb3JubyA8Y2hyaXN0aWFuYkBqZnJvZy5jb20+iJoEExYKAEIWIQSS
+w8jt+9pdVC3Gts7AvzSEkhHbJAUCYYU7tQIbAwUJA8JnAAULCQgHAgMiAgEGFQoJ
+CAsCBBYCAwECHgcCF4AACgkQwL80hJIR2yRQDgD/X1t/hW9+uXdSY59FOClhQw/t
+AzTYjDW+KLKadYJ3RAIBALD53rj7EnrXsSqv9Vqj3mJ7O38eXu50P57tD8ErpHMD
+nIsEYYU7tRIKKwYBBAGXVQEFAQEHQCfT+jXHVkslGAJqVafoeWO8Nwz/oPPzNDJb
+EOASsMRcAwEIB/4HAwK+Wi8OaidLuvQ6yknLUspoRL8KJlQu0JkfLxj6Wl6GrRtf
+MdUBxaGUQX5UzMIqyYstgHKz2kBYvrJijWdOkkRuL82FySSh4yi/97FBikOBiHgE
+GBYKACAWIQSSw8jt+9pdVC3Gts7AvzSEkhHbJAUCYYU7tQIbDAAKCRDAvzSEkhHb
+JNR/AQCQjGWljmP8pYj6ohP8bOwVB4VE5qxjdfWQvBCUA0LFwgEAxLGVeT88pw3+
+x7Cwd7SsuxlIOOCIJssFnUhA9Qsq2wE=
+=qCzy
+-----END PGP PRIVATE KEY BLOCK-----
+EOF
+			public_key = <<EOF
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+mDMEYYU7tRYJKwYBBAHaRw8BAQdAZ8vVdEyrWGssb7cdreG5GDGv6taHX/vWQdDG
+jn7zib+0KkNocmlzdGlhbiBCb25naW9ybm8gPGNocmlzdGlhbmJAamZyb2cuY29t
+PoiaBBMWCgBCFiEEksPI7fvaXVQtxrbOwL80hJIR2yQFAmGFO7UCGwMFCQPCZwAF
+CwkIBwIDIgIBBhUKCQgLAgQWAgMBAh4HAheAAAoJEMC/NISSEdskUA4A/19bf4Vv
+frl3UmOfRTgpYUMP7QM02Iw1viiymnWCd0QCAQCw+d64+xJ617Eqr/Vao95iezt/
+Hl7udD+e7Q/BK6RzA7g4BGGFO7USCisGAQQBl1UBBQEBB0An0/o1x1ZLJRgCalWn
+6HljvDcM/6Dz8zQyWxDgErDEXAMBCAeIeAQYFgoAIBYhBJLDyO372l1ULca2zsC/
+NISSEdskBQJhhTu1AhsMAAoJEMC/NISSEdsk1H8BAJCMZaWOY/yliPqiE/xs7BUH
+hUTmrGN19ZC8EJQDQsXCAQDEsZV5PzynDf7HsLB3tKy7GUg44IgmywWdSED1Cyrb
+AQ==
+=2kMe
+-----END PGP PUBLIC KEY BLOCK-----
+EOF
+			lifecycle {
+				ignore_changes = [
+					private_key,
+					passphrase,
+				]
+			}
+		}
+
+		resource "artifactory_local_rpm_repository" "{{ .repo_name }}" {
+			key 	     = "{{ .repo_name }}"
+			primary_keypair_ref = artifactory_keypair.{{ .kp_name }}.pair_name
+			secondary_keypair_ref = artifactory_keypair.{{ .kp_name2 }}.pair_name
+			yum_root_depth = 1
+			enable_file_lists_indexing = true
+			calculate_yum_metadata = true
+		}
+	`, map[string]interface{}{
+		"kp_id":     kpId,
+		"kp_name":   kpName,
+		"kp_id2":    kpId2,
+		"kp_name2":  kpName2,
+		"repo_name": name,
+	}) // we use randomness so that, in the case of failure and dangle, the next test can run without collision
+
+	resource.Test(t, resource.TestCase{
+		Steps: []resource.TestStep{
+			{
+				ExternalProviders: map[string]resource.ExternalProvider{
+					"artifactory": {
+						VersionConstraint: "12.8.0",
+						Source:            "jfrog/artifactory",
+					},
+				},
+				Config: config,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(fqrn, "id", name),
+					resource.TestCheckResourceAttr(fqrn, "key", name),
+				),
+			},
+			{
+				ProtoV6ProviderFactories: acctest.ProtoV6ProviderFactories,
+				Config:                   config,
+				ConfigPlanChecks: resource.ConfigPlanChecks{
+					PreApply: []plancheck.PlanCheck{
+						plancheck.ExpectEmptyPlan(),
+					},
+				},
+			},
+		},
+	})
+}
diff --git a/pkg/artifactory/resource/repository/local/resource_artifactory_local_terraform_repository.go b/pkg/artifactory/resource/repository/local/resource_artifactory_local_terraform_repository.go
index cee01639..ac0dbd59 100644
--- a/pkg/artifactory/resource/repository/local/resource_artifactory_local_terraform_repository.go
+++ b/pkg/artifactory/resource/repository/local/resource_artifactory_local_terraform_repository.go
@@ -1,52 +1,148 @@
 package local
 
 import (
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"context"
+	"reflect"
+
+	"github.com/hashicorp/terraform-plugin-framework/diag"
+	"github.com/hashicorp/terraform-plugin-framework/resource"
+	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
+	"github.com/hashicorp/terraform-plugin-framework/types"
+	sdkv2_schema "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/artifactory/resource/repository"
-	"github.com/jfrog/terraform-provider-shared/packer"
 	"github.com/samber/lo"
 )
 
-func GetTerraformSchemas(registryType string) map[int16]map[string]*schema.Schema {
-	return map[int16]map[string]*schema.Schema{
-		0: lo.Assign(
-			BaseSchemaV1,
-			repository.RepoLayoutRefSDKv2Schema(Rclass, "terraform_"+registryType),
+func NewTerraformModuleLocalRepositoryResource() resource.Resource {
+	return &localTerraformResource{
+		localResource: NewLocalRepositoryResource(
+			repository.TerraformModulePackageType,
+			"Terraform Module",
+			reflect.TypeFor[LocalTerraformResourceModel](),
+			reflect.TypeFor[LocalTerraformAPIModel](),
 		),
-		1: lo.Assign(
-			BaseSchemaV1,
-			repository.RepoLayoutRefSDKv2Schema(Rclass, "terraform_"+registryType),
+	}
+}
+
+func NewTerraformProviderLocalRepositoryResource() resource.Resource {
+	return &localTerraformResource{
+		localResource: NewLocalRepositoryResource(
+			repository.TerraformProviderPackageType,
+			"Terraform Provider",
+			reflect.TypeFor[LocalTerraformResourceModel](),
+			reflect.TypeFor[LocalTerraformAPIModel](),
 		),
 	}
 }
 
-func UnpackLocalTerraformRepository(data *schema.ResourceData, Rclass string, registryType string) RepositoryBaseParams {
-	repo := UnpackBaseRepo(Rclass, data, "terraform_"+registryType)
-	repo.TerraformType = registryType
+type localTerraformResource struct {
+	localResource
+}
+
+type LocalTerraformResourceModel struct {
+	LocalResourceModel
+}
+
+func (r *LocalTerraformResourceModel) GetCreateResourcePlanData(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) {
+	// Read Terraform plan data into the model
+	resp.Diagnostics.Append(req.Plan.Get(ctx, r)...)
+}
+
+func (r LocalTerraformResourceModel) SetCreateResourceStateData(ctx context.Context, resp *resource.CreateResponse) {
+	// Save data into Terraform state
+	resp.Diagnostics.Append(resp.State.Set(ctx, &r)...)
+}
+
+func (r *LocalTerraformResourceModel) GetReadResourceStateData(ctx context.Context, req resource.ReadRequest, resp *resource.ReadResponse) {
+	// Read Terraform state data into the model
+	resp.Diagnostics.Append(req.State.Get(ctx, r)...)
+}
+
+func (r LocalTerraformResourceModel) SetReadResourceStateData(ctx context.Context, resp *resource.ReadResponse) {
+	// Save data into Terraform state
+	resp.Diagnostics.Append(resp.State.Set(ctx, &r)...)
+}
+
+func (r *LocalTerraformResourceModel) GetUpdateResourcePlanData(ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse) {
+	// Read Terraform state data into the model
+	resp.Diagnostics.Append(req.Plan.Get(ctx, r)...)
+}
+
+func (r *LocalTerraformResourceModel) GetUpdateResourceStateData(ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse) {
+	// Read Terraform state data into the model
+	resp.Diagnostics.Append(req.State.Get(ctx, r)...)
+}
 
-	return repo
+func (r LocalTerraformResourceModel) SetUpdateResourceStateData(ctx context.Context, resp *resource.UpdateResponse) {
+	// Save data into Terraform state
+	resp.Diagnostics.Append(resp.State.Set(ctx, &r)...)
 }
 
-func ResourceArtifactoryLocalTerraformRepository(registryType string) *schema.Resource {
+func (r LocalTerraformResourceModel) ToAPIModel(ctx context.Context, packageType string) (interface{}, diag.Diagnostics) {
+	diags := diag.Diagnostics{}
 
-	var unpackLocalTerraformRepository = func(data *schema.ResourceData) (interface{}, string, error) {
-		repo := UnpackLocalTerraformRepository(data, Rclass, registryType)
-		return repo, repo.Id(), nil
+	model, d := r.LocalResourceModel.ToAPIModel(ctx, packageType)
+	if d != nil {
+		diags.Append(d...)
 	}
 
-	terraformSchemas := GetTerraformSchemas(registryType)
+	localAPIModel := model.(LocalAPIModel)
+	localAPIModel.RepoLayoutRef = r.RepoLayoutRef.ValueString()
+	localAPIModel.PackageType = repository.TerraformPackageType
 
-	constructor := func() (interface{}, error) {
-		return &RepositoryBaseParams{
-			PackageType: "terraform_" + registryType,
-			Rclass:      Rclass,
-		}, nil
+	var terraformType string
+	switch packageType {
+	case repository.TerraformModulePackageType:
+		terraformType = "module"
+	case repository.TerraformProviderPackageType:
+		terraformType = "provider"
 	}
 
-	return repository.MkResourceSchema(
-		terraformSchemas,
-		packer.Default(terraformSchemas[CurrentSchemaVersion]),
-		unpackLocalTerraformRepository,
-		constructor,
+	return LocalTerraformAPIModel{
+		LocalAPIModel: localAPIModel,
+		TerraformType: terraformType,
+	}, diags
+}
+
+func (r *LocalTerraformResourceModel) FromAPIModel(ctx context.Context, apiModel interface{}) diag.Diagnostics {
+	diags := diag.Diagnostics{}
+
+	model := apiModel.(*LocalTerraformAPIModel)
+
+	r.LocalResourceModel.FromAPIModel(ctx, model.LocalAPIModel)
+
+	r.RepoLayoutRef = types.StringValue(model.RepoLayoutRef)
+
+	return diags
+}
+
+type LocalTerraformAPIModel struct {
+	LocalAPIModel
+	TerraformType string `json:"terraformType"`
+}
+
+func (r *localTerraformResource) Schema(ctx context.Context, req resource.SchemaRequest, resp *resource.SchemaResponse) {
+	attributes := lo.Assign(
+		LocalAttributes,
+		repository.RepoLayoutRefAttribute(r.Rclass, r.PackageType),
 	)
+
+	resp.Schema = schema.Schema{
+		Version:     CurrentSchemaVersion,
+		Attributes:  attributes,
+		Description: r.Description,
+	}
+}
+
+func GetTerraformSchemas(registryType string) map[int16]map[string]*sdkv2_schema.Schema {
+	return map[int16]map[string]*sdkv2_schema.Schema{
+		0: lo.Assign(
+			BaseSchemaV1,
+			repository.RepoLayoutRefSDKv2Schema(Rclass, "terraform_"+registryType),
+		),
+		1: lo.Assign(
+			BaseSchemaV1,
+			repository.RepoLayoutRefSDKv2Schema(Rclass, "terraform_"+registryType),
+		),
+	}
 }
diff --git a/pkg/artifactory/resource/repository/local/resource_artifactory_local_terraform_repository_test.go b/pkg/artifactory/resource/repository/local/resource_artifactory_local_terraform_repository_test.go
new file mode 100644
index 00000000..6c9cdeb3
--- /dev/null
+++ b/pkg/artifactory/resource/repository/local/resource_artifactory_local_terraform_repository_test.go
@@ -0,0 +1,162 @@
+package local_test
+
+import (
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/plancheck"
+	"github.com/jfrog/terraform-provider-artifactory/v12/pkg/acctest"
+	"github.com/jfrog/terraform-provider-shared/testutil"
+	"github.com/jfrog/terraform-provider-shared/util"
+	"github.com/jfrog/terraform-provider-shared/validator"
+)
+
+func TestAccLocalTerraformModuleRepository(t *testing.T) {
+	_, fqrn, name := testutil.MkNames("terraform-local", "artifactory_local_terraform_module_repository")
+	params := map[string]interface{}{
+		"name": name,
+	}
+	localRepositoryBasic := util.ExecuteTemplate(
+		"TestAccLocalTerraformModuleRepository",
+		`resource "artifactory_local_terraform_module_repository" "{{ .name }}" {
+		  key = "{{ .name }}"
+		}`,
+		params,
+	)
+
+	resource.Test(t, resource.TestCase{
+		ProtoV6ProviderFactories: acctest.ProtoV6ProviderFactories,
+		CheckDestroy:             acctest.VerifyDeleted(t, fqrn, "", acctest.CheckRepo),
+		Steps: []resource.TestStep{
+			{
+				Config: localRepositoryBasic,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(fqrn, "key", name),
+					resource.TestCheckResourceAttr(fqrn, "repo_layout_ref", "terraform-module-default"),
+				),
+			},
+			{
+				ResourceName:      fqrn,
+				ImportState:       true,
+				ImportStateVerify: true,
+				ImportStateCheck:  validator.CheckImportState(name, "key"),
+			},
+		},
+	})
+}
+
+func TestAccLocalTerraformProviderRepository(t *testing.T) {
+	_, fqrn, name := testutil.MkNames("terraform-local", "artifactory_local_terraform_provider_repository")
+	params := map[string]interface{}{
+		"name": name,
+	}
+	localRepositoryBasic := util.ExecuteTemplate(
+		"TestAccLocalTerraformProviderRepository",
+		`resource "artifactory_local_terraform_provider_repository" "{{ .name }}" {
+		  key = "{{ .name }}"
+		}`,
+		params,
+	)
+
+	resource.Test(t, resource.TestCase{
+		ProtoV6ProviderFactories: acctest.ProtoV6ProviderFactories,
+		CheckDestroy:             acctest.VerifyDeleted(t, fqrn, "", acctest.CheckRepo),
+		Steps: []resource.TestStep{
+			{
+				Config: localRepositoryBasic,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(fqrn, "key", name),
+					resource.TestCheckResourceAttr(fqrn, "repo_layout_ref", "terraform-provider-default"),
+				),
+			},
+			{
+				ResourceName:      fqrn,
+				ImportState:       true,
+				ImportStateVerify: true,
+				ImportStateCheck:  validator.CheckImportState(name, "key"),
+			},
+		},
+	})
+}
+
+func TestAccLocalTerraformModuleRepository_UpgradeFromSDKv2(t *testing.T) {
+	_, fqrn, name := testutil.MkNames("terraform-local", "artifactory_local_terraform_module_repository")
+	params := map[string]interface{}{
+		"name": name,
+	}
+	config := util.ExecuteTemplate(
+		"TestAccLocalTerraformModuleRepository",
+		`resource "artifactory_local_terraform_module_repository" "{{ .name }}" {
+		  key = "{{ .name }}"
+		}`,
+		params,
+	)
+
+	resource.Test(t, resource.TestCase{
+		Steps: []resource.TestStep{
+			{
+				ExternalProviders: map[string]resource.ExternalProvider{
+					"artifactory": {
+						VersionConstraint: "12.8.0",
+						Source:            "jfrog/artifactory",
+					},
+				},
+				Config: config,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(fqrn, "id", name),
+					resource.TestCheckResourceAttr(fqrn, "key", name),
+				),
+			},
+			{
+				ProtoV6ProviderFactories: acctest.ProtoV6ProviderFactories,
+				Config:                   config,
+				ConfigPlanChecks: resource.ConfigPlanChecks{
+					PreApply: []plancheck.PlanCheck{
+						plancheck.ExpectEmptyPlan(),
+					},
+				},
+			},
+		},
+	})
+}
+
+func TestAccLocalTerraformProviderRepository_UpgradeFromSDKv2(t *testing.T) {
+	_, fqrn, name := testutil.MkNames("terraform-local", "artifactory_local_terraform_provider_repository")
+	params := map[string]interface{}{
+		"name": name,
+	}
+	config := util.ExecuteTemplate(
+		"TestAccLocalTerraformProviderRepository",
+		`resource "artifactory_local_terraform_provider_repository" "{{ .name }}" {
+		  key = "{{ .name }}"
+		}`,
+		params,
+	)
+
+	resource.Test(t, resource.TestCase{
+		Steps: []resource.TestStep{
+			{
+				ExternalProviders: map[string]resource.ExternalProvider{
+					"artifactory": {
+						VersionConstraint: "12.8.0",
+						Source:            "jfrog/artifactory",
+					},
+				},
+				Config: config,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(fqrn, "id", name),
+					resource.TestCheckResourceAttr(fqrn, "key", name),
+				),
+			},
+			{
+				ProtoV6ProviderFactories: acctest.ProtoV6ProviderFactories,
+				Config:                   config,
+				ConfigPlanChecks: resource.ConfigPlanChecks{
+					PreApply: []plancheck.PlanCheck{
+						plancheck.ExpectEmptyPlan(),
+					},
+				},
+			},
+		},
+	})
+}
diff --git a/pkg/artifactory/resource/repository/repository.go b/pkg/artifactory/resource/repository/repository.go
index 2a79361d..cce6bb35 100644
--- a/pkg/artifactory/resource/repository/repository.go
+++ b/pkg/artifactory/resource/repository/repository.go
@@ -80,6 +80,32 @@ const (
 	VCSPackageType               = "vcs"
 )
 
+var PackageNameLookup = map[string]string{
+	BowerPackageType:            "Bower",
+	ChefPackageType:             "Chef",
+	CocoapodsPackageType:        "CocoaPods",
+	ComposerPackageType:         "Composer",
+	CondaPackageType:            "Conda",
+	CranPackageType:             "CRAN",
+	GemsPackageType:             "Gems",
+	GenericPackageType:          "Generic",
+	GitLFSPackageType:           "GitLfs",
+	GoPackageType:               "Go",
+	GradlePackageType:           "Gradle",
+	HelmPackageType:             "Helm",
+	HuggingFacePackageType:      "HuggingFace ML",
+	IvyPackageType:              "Ivy",
+	NPMPackageType:              "Npm",
+	OpkgPackageType:             "Opkg",
+	PubPackageType:              "Pub",
+	PuppetPackageType:           "Puppet",
+	PyPiPackageType:             "PyPi",
+	SBTPackageType:              "SBT",
+	SwiftPackageType:            "Swift",
+	TerraformBackendPackageType: "Terraform Backend",
+	VagrantPackageType:          "Vagrant",
+}
+
 type BaseResource struct {
 	util.JFrogResource
 	Description       string