diff --git a/src/service_name.json b/src/service_name.json
index 95adf07ef57..eafb7eb03b6 100644
--- a/src/service_name.json
+++ b/src/service_name.json
@@ -433,5 +433,16 @@
     "Command": "az arcdata",
     "AzureServiceName": "Azure Data Services",
     "URL": "https://docs.microsoft.com/en-us/sql/sql-server/azure-arc/overview?view=sql-server-ver15"
+  }, 
+  {
+    "Command": "az vm-repair",
+    "AzureServiceName": "Azure CLI VM Repair Extension",
+    "URL": "https://docs.microsoft.com/en-us/cli/azure/vm/repair?view=azure-cli-latest"
+  },
+  {
+    "Command": "az vm",
+    "AzureServiceName": "Azure Virtual Machines",
+    "URL": "https://docs.microsoft.com/en-us/azure/virtual-machines/"
   }
-]
\ No newline at end of file
+]
+
diff --git a/src/vm-repair/HISTORY.rst b/src/vm-repair/HISTORY.rst
new file mode 100644
index 00000000000..15e2be7692b
--- /dev/null
+++ b/src/vm-repair/HISTORY.rst
@@ -0,0 +1,13 @@
+
+Release History
+===============
+
+0.3.6
+++++++
+Add support for ALAR2 which requires cloud-init script to prepare the recovery VM with a
+build environment for Rust.
+
+0.3.5
+++++++
+
+Add support for nested VMs
\ No newline at end of file
diff --git a/src/vm-repair/setup.py b/src/vm-repair/setup.py
index 933f1adba42..7c6ab3ef63c 100644
--- a/src/vm-repair/setup.py
+++ b/src/vm-repair/setup.py
@@ -8,7 +8,7 @@
 from codecs import open
 from setuptools import setup, find_packages
 
-VERSION = "0.3.5"
+VERSION = "0.3.6"
 
 CLASSIFIERS = [
     'Development Status :: 4 - Beta',
@@ -26,11 +26,14 @@
 
 DEPENDENCIES = []
 
+with open('HISTORY.rst', 'r', encoding='utf-8') as f:
+    HISTORY = f.read()
+
 setup(
     name='vm-repair',
     version=VERSION,
     description='Auto repair commands to fix VMs.',
-    long_description='VM repair command will enable Azure users to self-repair non-bootable VMs by copying the source VM\'s OS disk and attaching it to a newly created repair VM.',
+    long_description='VM repair command will enable Azure users to self-repair non-bootable VMs by copying the source VM\'s OS disk and attaching it to a newly created repair VM.'+ '\n\n' + HISTORY,
     license='MIT',
     author='Microsoft Corporation',
     author_email='caiddev@microsoft.com',
@@ -44,6 +47,7 @@
             'scripts/enable-nestedhyperv.ps1',
             'scripts/linux-mount-encrypted-disk.sh',
             'scripts/win-mount-encrypted-disk.ps1',
+            'linux-build_setup-cloud-init.txt',
             'azext_metadata.json'
         ]
     },