diff --git a/pom.xml b/pom.xml
index c7da478f1ccf..bf7e1f16bbe4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -165,6 +165,7 @@
     <module>sdk/mongocluster</module>
     <module>sdk/mongodbatlas</module>
     <module>sdk/monitor</module>
+    <module>sdk/msi</module>
     <module>sdk/mysql</module>
     <module>sdk/mysqlflexibleserver</module>
     <module>sdk/neonpostgres</module>
diff --git a/sdk/resourcemanager/azure-resourcemanager-msi/CHANGELOG.md b/sdk/msi/azure-resourcemanager-msi/CHANGELOG.md
similarity index 100%
rename from sdk/resourcemanager/azure-resourcemanager-msi/CHANGELOG.md
rename to sdk/msi/azure-resourcemanager-msi/CHANGELOG.md
diff --git a/sdk/resourcemanager/azure-resourcemanager-msi/README.md b/sdk/msi/azure-resourcemanager-msi/README.md
similarity index 100%
rename from sdk/resourcemanager/azure-resourcemanager-msi/README.md
rename to sdk/msi/azure-resourcemanager-msi/README.md
diff --git a/sdk/msi/azure-resourcemanager-msi/assets.json b/sdk/msi/azure-resourcemanager-msi/assets.json
new file mode 100644
index 000000000000..391f17e1c809
--- /dev/null
+++ b/sdk/msi/azure-resourcemanager-msi/assets.json
@@ -0,0 +1,6 @@
+{
+  "AssetsRepo": "Azure/azure-sdk-assets",
+  "AssetsRepoPrefixPath": "java",
+  "TagPrefix": "java/msi/azure-resourcemanager-msi",
+  "Tag": "java/msi/azure-resourcemanager-msi_dd4ddd6b42"
+}
diff --git a/sdk/resourcemanager/azure-resourcemanager-msi/pom.xml b/sdk/msi/azure-resourcemanager-msi/pom.xml
similarity index 90%
rename from sdk/resourcemanager/azure-resourcemanager-msi/pom.xml
rename to sdk/msi/azure-resourcemanager-msi/pom.xml
index 32b2543d9c4a..19d3d144d979 100644
--- a/sdk/resourcemanager/azure-resourcemanager-msi/pom.xml
+++ b/sdk/msi/azure-resourcemanager-msi/pom.xml
@@ -1,4 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) Microsoft Corporation. All rights reserved.
+ Licensed under the MIT License. See License.txt in the project root for
+ license information.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
@@ -57,12 +61,12 @@
     <dependency>
       <groupId>com.azure.resourcemanager</groupId>
       <artifactId>azure-resourcemanager-resources</artifactId>
-      <version>2.54.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-resources;current} -->
+      <version>2.53.2</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-resources;dependency} -->
     </dependency>
     <dependency>
       <groupId>com.azure.resourcemanager</groupId>
       <artifactId>azure-resourcemanager-authorization</artifactId>
-      <version>2.54.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-authorization;current} -->
+      <version>2.53.2</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-authorization;dependency} -->
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
@@ -95,7 +99,7 @@
         <dependency>
           <groupId>com.azure.resourcemanager</groupId>
           <artifactId>azure-resourcemanager-test</artifactId>
-          <version>2.0.0-beta.3</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-test;current} -->
+          <version>2.0.0-beta.2</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-test;dependency} -->
           <scope>test</scope>
         </dependency>
       </dependencies>
diff --git a/sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/MsiManager.java b/sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/MsiManager.java
similarity index 100%
rename from sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/MsiManager.java
rename to sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/MsiManager.java
diff --git a/sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/FederatedIdentityCredentialsClient.java b/sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/FederatedIdentityCredentialsClient.java
similarity index 100%
rename from sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/FederatedIdentityCredentialsClient.java
rename to sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/FederatedIdentityCredentialsClient.java
diff --git a/sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/ManagedServiceIdentityClient.java b/sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/ManagedServiceIdentityClient.java
similarity index 100%
rename from sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/ManagedServiceIdentityClient.java
rename to sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/ManagedServiceIdentityClient.java
diff --git a/sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/OperationsClient.java b/sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/OperationsClient.java
similarity index 100%
rename from sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/OperationsClient.java
rename to sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/OperationsClient.java
diff --git a/sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/SystemAssignedIdentitiesClient.java b/sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/SystemAssignedIdentitiesClient.java
similarity index 100%
rename from sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/SystemAssignedIdentitiesClient.java
rename to sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/SystemAssignedIdentitiesClient.java
diff --git a/sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/UserAssignedIdentitiesClient.java b/sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/UserAssignedIdentitiesClient.java
similarity index 100%
rename from sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/UserAssignedIdentitiesClient.java
rename to sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/UserAssignedIdentitiesClient.java
diff --git a/sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/models/FederatedIdentityCredentialInner.java b/sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/models/FederatedIdentityCredentialInner.java
similarity index 100%
rename from sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/models/FederatedIdentityCredentialInner.java
rename to sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/models/FederatedIdentityCredentialInner.java
diff --git a/sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/models/FederatedIdentityCredentialProperties.java b/sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/models/FederatedIdentityCredentialProperties.java
similarity index 100%
rename from sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/models/FederatedIdentityCredentialProperties.java
rename to sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/models/FederatedIdentityCredentialProperties.java
diff --git a/sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/models/IdentityInner.java b/sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/models/IdentityInner.java
similarity index 100%
rename from sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/models/IdentityInner.java
rename to sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/models/IdentityInner.java
diff --git a/sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/models/OperationInner.java b/sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/models/OperationInner.java
similarity index 100%
rename from sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/models/OperationInner.java
rename to sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/models/OperationInner.java
diff --git a/sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/models/SystemAssignedIdentityInner.java b/sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/models/SystemAssignedIdentityInner.java
similarity index 100%
rename from sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/models/SystemAssignedIdentityInner.java
rename to sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/models/SystemAssignedIdentityInner.java
diff --git a/sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/models/SystemAssignedIdentityProperties.java b/sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/models/SystemAssignedIdentityProperties.java
similarity index 100%
rename from sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/models/SystemAssignedIdentityProperties.java
rename to sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/models/SystemAssignedIdentityProperties.java
diff --git a/sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/models/UserAssignedIdentityProperties.java b/sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/models/UserAssignedIdentityProperties.java
similarity index 100%
rename from sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/models/UserAssignedIdentityProperties.java
rename to sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/models/UserAssignedIdentityProperties.java
diff --git a/sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/models/package-info.java b/sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/models/package-info.java
similarity index 100%
rename from sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/models/package-info.java
rename to sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/models/package-info.java
diff --git a/sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/package-info.java b/sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/package-info.java
similarity index 100%
rename from sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/package-info.java
rename to sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/fluent/package-info.java
diff --git a/sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/implementation/FederatedIdentityCredentialsClientImpl.java b/sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/implementation/FederatedIdentityCredentialsClientImpl.java
similarity index 100%
rename from sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/implementation/FederatedIdentityCredentialsClientImpl.java
rename to sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/implementation/FederatedIdentityCredentialsClientImpl.java
diff --git a/sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/implementation/IdentitesImpl.java b/sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/implementation/IdentitesImpl.java
similarity index 100%
rename from sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/implementation/IdentitesImpl.java
rename to sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/implementation/IdentitesImpl.java
diff --git a/sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/implementation/IdentityImpl.java b/sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/implementation/IdentityImpl.java
similarity index 100%
rename from sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/implementation/IdentityImpl.java
rename to sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/implementation/IdentityImpl.java
diff --git a/sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/implementation/ManagedServiceIdentityClientBuilder.java b/sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/implementation/ManagedServiceIdentityClientBuilder.java
similarity index 100%
rename from sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/implementation/ManagedServiceIdentityClientBuilder.java
rename to sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/implementation/ManagedServiceIdentityClientBuilder.java
diff --git a/sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/implementation/ManagedServiceIdentityClientImpl.java b/sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/implementation/ManagedServiceIdentityClientImpl.java
similarity index 100%
rename from sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/implementation/ManagedServiceIdentityClientImpl.java
rename to sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/implementation/ManagedServiceIdentityClientImpl.java
diff --git a/sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/implementation/OperationsClientImpl.java b/sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/implementation/OperationsClientImpl.java
similarity index 100%
rename from sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/implementation/OperationsClientImpl.java
rename to sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/implementation/OperationsClientImpl.java
diff --git a/sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/implementation/SystemAssignedIdentitiesClientImpl.java b/sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/implementation/SystemAssignedIdentitiesClientImpl.java
similarity index 100%
rename from sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/implementation/SystemAssignedIdentitiesClientImpl.java
rename to sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/implementation/SystemAssignedIdentitiesClientImpl.java
diff --git a/sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/implementation/UserAssignedIdentitiesClientImpl.java b/sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/implementation/UserAssignedIdentitiesClientImpl.java
similarity index 100%
rename from sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/implementation/UserAssignedIdentitiesClientImpl.java
rename to sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/implementation/UserAssignedIdentitiesClientImpl.java
diff --git a/sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/models/FederatedIdentityCredentialsListResult.java b/sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/models/FederatedIdentityCredentialsListResult.java
similarity index 100%
rename from sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/models/FederatedIdentityCredentialsListResult.java
rename to sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/models/FederatedIdentityCredentialsListResult.java
diff --git a/sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/models/Identities.java b/sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/models/Identities.java
similarity index 100%
rename from sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/models/Identities.java
rename to sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/models/Identities.java
diff --git a/sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/models/Identity.java b/sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/models/Identity.java
similarity index 100%
rename from sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/models/Identity.java
rename to sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/models/Identity.java
diff --git a/sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/models/IdentityUpdate.java b/sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/models/IdentityUpdate.java
similarity index 100%
rename from sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/models/IdentityUpdate.java
rename to sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/models/IdentityUpdate.java
diff --git a/sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/models/IsolationScope.java b/sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/models/IsolationScope.java
similarity index 100%
rename from sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/models/IsolationScope.java
rename to sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/models/IsolationScope.java
diff --git a/sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/models/OperationDisplay.java b/sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/models/OperationDisplay.java
similarity index 100%
rename from sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/models/OperationDisplay.java
rename to sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/models/OperationDisplay.java
diff --git a/sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/models/OperationListResult.java b/sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/models/OperationListResult.java
similarity index 100%
rename from sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/models/OperationListResult.java
rename to sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/models/OperationListResult.java
diff --git a/sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/models/UserAssignedIdentitiesListResult.java b/sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/models/UserAssignedIdentitiesListResult.java
similarity index 100%
rename from sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/models/UserAssignedIdentitiesListResult.java
rename to sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/models/UserAssignedIdentitiesListResult.java
diff --git a/sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/models/package-info.java b/sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/models/package-info.java
similarity index 100%
rename from sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/models/package-info.java
rename to sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/models/package-info.java
diff --git a/sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/package-info.java b/sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/package-info.java
similarity index 100%
rename from sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/package-info.java
rename to sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/package-info.java
diff --git a/sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/module-info.java b/sdk/msi/azure-resourcemanager-msi/src/main/java/module-info.java
similarity index 100%
rename from sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/module-info.java
rename to sdk/msi/azure-resourcemanager-msi/src/main/java/module-info.java
diff --git a/sdk/resourcemanager/azure-resourcemanager-msi/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-msi/proxy-config.json b/sdk/msi/azure-resourcemanager-msi/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-msi/proxy-config.json
similarity index 100%
rename from sdk/resourcemanager/azure-resourcemanager-msi/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-msi/proxy-config.json
rename to sdk/msi/azure-resourcemanager-msi/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-msi/proxy-config.json
diff --git a/sdk/resourcemanager/azure-resourcemanager-msi/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-msi/reflect-config.json b/sdk/msi/azure-resourcemanager-msi/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-msi/reflect-config.json
similarity index 100%
rename from sdk/resourcemanager/azure-resourcemanager-msi/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-msi/reflect-config.json
rename to sdk/msi/azure-resourcemanager-msi/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-msi/reflect-config.json
diff --git a/sdk/resourcemanager/azure-resourcemanager-msi/src/main/resources/azure-resourcemanager-msi.properties b/sdk/msi/azure-resourcemanager-msi/src/main/resources/azure-resourcemanager-msi.properties
similarity index 100%
rename from sdk/resourcemanager/azure-resourcemanager-msi/src/main/resources/azure-resourcemanager-msi.properties
rename to sdk/msi/azure-resourcemanager-msi/src/main/resources/azure-resourcemanager-msi.properties
diff --git a/sdk/resourcemanager/azure-resourcemanager-msi/src/samples/java/com/azure/resourcemanager/msi/ReadmeSamples.java b/sdk/msi/azure-resourcemanager-msi/src/samples/java/com/azure/resourcemanager/msi/ReadmeSamples.java
similarity index 100%
rename from sdk/resourcemanager/azure-resourcemanager-msi/src/samples/java/com/azure/resourcemanager/msi/ReadmeSamples.java
rename to sdk/msi/azure-resourcemanager-msi/src/samples/java/com/azure/resourcemanager/msi/ReadmeSamples.java
diff --git a/sdk/resourcemanager/azure-resourcemanager-msi/src/test/java/com/azure/resourcemanager/msi/MSIIdentityManagementTests.java b/sdk/msi/azure-resourcemanager-msi/src/test/java/com/azure/resourcemanager/msi/MSIIdentityManagementTests.java
similarity index 100%
rename from sdk/resourcemanager/azure-resourcemanager-msi/src/test/java/com/azure/resourcemanager/msi/MSIIdentityManagementTests.java
rename to sdk/msi/azure-resourcemanager-msi/src/test/java/com/azure/resourcemanager/msi/MSIIdentityManagementTests.java
diff --git a/sdk/resourcemanager/azure-resourcemanager-msi/src/test/resources/junit-platform.properties b/sdk/msi/azure-resourcemanager-msi/src/test/resources/junit-platform.properties
similarity index 100%
rename from sdk/resourcemanager/azure-resourcemanager-msi/src/test/resources/junit-platform.properties
rename to sdk/msi/azure-resourcemanager-msi/src/test/resources/junit-platform.properties
diff --git a/sdk/msi/ci.yml b/sdk/msi/ci.yml
new file mode 100644
index 000000000000..1110b1a81196
--- /dev/null
+++ b/sdk/msi/ci.yml
@@ -0,0 +1,38 @@
+# NOTE: Please refer to https://aka.ms/azsdk/engsys/ci-yaml before editing this file.
+
+trigger:
+  branches:
+    include:
+      - main
+      - hotfix/*
+      - release/*
+  paths:
+    include:
+      - sdk/msi/
+
+pr:
+  branches:
+    include:
+      - main
+      - feature/*
+      - hotfix/*
+      - release/*
+  paths:
+    include:
+      - sdk/msi/
+
+parameters:
+- name: release_azureresourcemanagermsi
+  displayName: 'azure-resourcemanager-msi'
+  type: boolean
+  default: false
+
+extends:
+  template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml
+  parameters:
+    ServiceDirectory: msi
+    Artifacts:
+      - name: azure-resourcemanager-msi
+        groupId: com.azure.resourcemanager
+        safeName: azureresourcemanagermsi
+        releaseInBatch: ${{ parameters.release_azureresourcemanagermsi }}
diff --git a/sdk/msi/pom.xml b/sdk/msi/pom.xml
new file mode 100644
index 000000000000..03cd77a779ab
--- /dev/null
+++ b/sdk/msi/pom.xml
@@ -0,0 +1,14 @@
+<!-- Copyright (c) Microsoft Corporation. All rights reserved.
+     Licensed under the MIT License. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.azure</groupId>
+  <artifactId>azure-msi-service</artifactId>
+  <packaging>pom</packaging>
+  <version>1.0.0</version><!-- Need not change for every release-->
+
+  <modules>
+    <module>azure-resourcemanager-msi</module>
+  </modules>
+</project>
diff --git a/sdk/resourcemanager/api-specs.json b/sdk/resourcemanager/api-specs.json
index 87daaf0646f7..9d0b4d359784 100644
--- a/sdk/resourcemanager/api-specs.json
+++ b/sdk/resourcemanager/api-specs.json
@@ -292,7 +292,7 @@
     "args": "--tag=package-2022-04 --rename-model=EndpointType:EndpointTypes --enable-sync-stack=false"
   },
   "msi": {
-    "dir": "azure-resourcemanager-msi",
+    "dir": "../msi/azure-resourcemanager-msi",
     "source": "specification/msi/resource-manager/readme.md",
     "package": "com.azure.resourcemanager.msi",
     "args": "--tag=package-2024-11-30 --add-client-flatten=Identity --enable-sync-stack=false"
diff --git a/sdk/resourcemanager/azure-resourcemanager-msi/assets.json b/sdk/resourcemanager/azure-resourcemanager-msi/assets.json
deleted file mode 100644
index 50b69031f863..000000000000
--- a/sdk/resourcemanager/azure-resourcemanager-msi/assets.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "AssetsRepo": "Azure/azure-sdk-assets",
-  "AssetsRepoPrefixPath": "java",
-  "TagPrefix": "java/resourcemanager/azure-resourcemanager-msi",
-  "Tag": "java/resourcemanager/azure-resourcemanager-msi_f9385f5227"
-}
diff --git a/sdk/resourcemanager/azure-resourcemanager/pom.xml b/sdk/resourcemanager/azure-resourcemanager/pom.xml
index 821df092f49d..9932a4997bba 100644
--- a/sdk/resourcemanager/azure-resourcemanager/pom.xml
+++ b/sdk/resourcemanager/azure-resourcemanager/pom.xml
@@ -106,7 +106,7 @@
     <dependency>
       <groupId>com.azure.resourcemanager</groupId>
       <artifactId>azure-resourcemanager-msi</artifactId>
-      <version>2.54.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-msi;current} -->
+      <version>2.53.2</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-msi;dependency} -->
     </dependency>
     <dependency>
       <groupId>com.azure.resourcemanager</groupId>
diff --git a/sdk/resourcemanager/ci.yml b/sdk/resourcemanager/ci.yml
index aee5474554d7..61f17a55cc84 100644
--- a/sdk/resourcemanager/ci.yml
+++ b/sdk/resourcemanager/ci.yml
@@ -17,7 +17,6 @@ trigger:
       - sdk/resourcemanager/azure-resourcemanager-cosmos/pom.xml
       - sdk/resourcemanager/azure-resourcemanager-eventhubs/pom.xml
       - sdk/resourcemanager/azure-resourcemanager-monitor/pom.xml
-      - sdk/resourcemanager/azure-resourcemanager-msi/pom.xml
       - sdk/resourcemanager/azure-resourcemanager-perf/pom.xml
       - sdk/resourcemanager/azure-resourcemanager-privatedns/pom.xml
       - sdk/resourcemanager/azure-resourcemanager-redis/pom.xml
@@ -46,7 +45,6 @@ pr:
       - sdk/resourcemanager/azure-resourcemanager-cosmos/pom.xml
       - sdk/resourcemanager/azure-resourcemanager-eventhubs/pom.xml
       - sdk/resourcemanager/azure-resourcemanager-monitor/pom.xml
-      - sdk/resourcemanager/azure-resourcemanager-msi/pom.xml
       - sdk/resourcemanager/azure-resourcemanager-perf/pom.xml
       - sdk/resourcemanager/azure-resourcemanager-privatedns/pom.xml
       - sdk/resourcemanager/azure-resourcemanager-redis/pom.xml
@@ -82,10 +80,6 @@ parameters:
   displayName: 'azure-resourcemanager-monitor'
   type: boolean
   default: true
-- name: release_azureresourcemanagermsi
-  displayName: 'azure-resourcemanager-msi'
-  type: boolean
-  default: true
 - name: release_azureresourcemanagerprivatedns
   displayName: 'azure-resourcemanager-privatedns'
   type: boolean
@@ -144,10 +138,6 @@ extends:
         groupId: com.azure.resourcemanager
         safeName: azureresourcemanagermonitor
         releaseInBatch: ${{ parameters.release_azureresourcemanagermonitor }}
-      - name: azure-resourcemanager-msi
-        groupId: com.azure.resourcemanager
-        safeName: azureresourcemanagermsi
-        releaseInBatch: ${{ parameters.release_azureresourcemanagermsi }}
       - name: azure-resourcemanager-privatedns
         groupId: com.azure.resourcemanager
         safeName: azureresourcemanagerprivatedns
diff --git a/sdk/resourcemanager/pom.xml b/sdk/resourcemanager/pom.xml
index 5d4a51daf48d..34460f73d114 100644
--- a/sdk/resourcemanager/pom.xml
+++ b/sdk/resourcemanager/pom.xml
@@ -15,7 +15,6 @@
     <module>azure-resourcemanager-cosmos</module>
     <module>azure-resourcemanager-eventhubs</module>
     <module>azure-resourcemanager-monitor</module>
-    <module>azure-resourcemanager-msi</module>
     <module>azure-resourcemanager-perf</module>
     <module>azure-resourcemanager-privatedns</module>
     <module>azure-resourcemanager-resources</module>
diff --git a/sdk/spring/pipeline/ClientFromSourcePom.xml b/sdk/spring/pipeline/ClientFromSourcePom.xml
index 91a8dea0867f..08bca900b115 100644
--- a/sdk/spring/pipeline/ClientFromSourcePom.xml
+++ b/sdk/spring/pipeline/ClientFromSourcePom.xml
@@ -47,7 +47,7 @@
     <module>../../resourcemanager/azure-resourcemanager-eventhubs/pom.xml</module>
     <module>../../keyvault/azure-resourcemanager-keyvault/pom.xml</module>
     <module>../../resourcemanager/azure-resourcemanager-monitor/pom.xml</module>
-    <module>../../resourcemanager/azure-resourcemanager-msi/pom.xml</module>
+    <module>../../msi/azure-resourcemanager-msi/pom.xml</module>
     <module>../../network/azure-resourcemanager-network/pom.xml</module>
     <module>../../resourcemanager/azure-resourcemanager-privatedns/pom.xml</module>
     <module>../../resourcemanager/azure-resourcemanager-redis/pom.xml</module>
diff --git a/sdk/spring/pipeline/compatibility-tests-job.yml b/sdk/spring/pipeline/compatibility-tests-job.yml
index b3e9417aba72..8101b88b2dc2 100644
--- a/sdk/spring/pipeline/compatibility-tests-job.yml
+++ b/sdk/spring/pipeline/compatibility-tests-job.yml
@@ -44,6 +44,7 @@ jobs:
             - 'sdk/jdbc'
             - 'sdk/keyvault'
             - 'sdk/monitor'
+            - 'sdk/msi/azure-resourcemanager-msi'
             - 'sdk/network'
             - 'sdk/spring'
             - 'sdk/parents/azure-client-sdk-parent'