diff --git a/src/vm-repair/HISTORY.rst b/src/vm-repair/HISTORY.rst
index 12d4c2c8d43..8e4af56d574 100644
--- a/src/vm-repair/HISTORY.rst
+++ b/src/vm-repair/HISTORY.rst
@@ -2,6 +2,10 @@
 Release History
 ===============
 
+0.4.5
+++++++
+Improve az vm repair reset-nic command to use subnet list available ips command
+
 0.4.4
 ++++++
 Add az vm repair reset-nic command
diff --git a/src/vm-repair/azext_vm_repair/custom.py b/src/vm-repair/azext_vm_repair/custom.py
index 18d1ef04290..9f999c08748 100644
--- a/src/vm-repair/azext_vm_repair/custom.py
+++ b/src/vm-repair/azext_vm_repair/custom.py
@@ -567,16 +567,17 @@ def reset_nic(cmd, vm_name, resource_group_name, yes=False):
         ip_config_object = json.loads(ip_config_string)
 
         subnet_id = ip_config_object['subnet']['id']
-        vnet_name = subnet_id.split('/')[-3]
+        subnet_id_tokens = subnet_id.split('/')
+        subnet_name = subnet_id_tokens[-1]
+        vnet_name = subnet_id_tokens[-3]
         ipconfig_name = ip_config_object['name']
         orig_ip_address = ip_config_object['privateIpAddress']
         # Dynamic | Static
         orig_ip_allocation_method = ip_config_object['privateIpAllocationMethod']
 
         # Get aviailable ip address within subnet
-        # Change to az network vnet subnet list-available-ips when it is available
-        get_available_ip_command = 'az network vnet list-available-ips -g {g} -n {vnet} --query [0] -o tsv' \
-                                   .format(g=resource_group_name, vnet=vnet_name)
+        get_available_ip_command = 'az network vnet subnet list-available-ips -g {g} --vnet-name {vnet} --name {subnet} --query [0] -o tsv' \
+                                   .format(g=resource_group_name, vnet=vnet_name, subnet=subnet_name)
         swap_ip_address = _call_az_command(get_available_ip_command)
         if not swap_ip_address:
             # Raise available IP not found
diff --git a/src/vm-repair/setup.py b/src/vm-repair/setup.py
index e54fc81e972..c6255f8980e 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.4.4"
+VERSION = "0.4.5"
 
 CLASSIFIERS = [
     'Development Status :: 4 - Beta',