diff --git a/src/vm-repair/HISTORY.rst b/src/vm-repair/HISTORY.rst
index 90ed95e6d5d..1a16b3e6333 100644
--- a/src/vm-repair/HISTORY.rst
+++ b/src/vm-repair/HISTORY.rst
@@ -1,6 +1,10 @@
 
 Release History
 ===============
+0.5.6
+++++++
+Renaming the Public IP resource.
+Fix the name of the resource, previously the name was always "yes". Now it follows the format repair-<VM>_PublicIP
 
 0.5.5
 ++++++
diff --git a/src/vm-repair/azext_vm_repair/_validators.py b/src/vm-repair/azext_vm_repair/_validators.py
index e097b7ecd12..08dff07ab57 100644
--- a/src/vm-repair/azext_vm_repair/_validators.py
+++ b/src/vm-repair/azext_vm_repair/_validators.py
@@ -224,7 +224,7 @@ def _prompt_public_ip(namespace):
     from knack.prompting import prompt_y_n, NoTTYException
     try:
         if prompt_y_n('Does repair vm requires public ip?'):
-            namespace.associate_public_ip = "yes"
+            namespace.associate_public_ip = namespace.repair_vm_name + "PublicIP"
         else:
             namespace.associate_public_ip = '""'
 
diff --git a/src/vm-repair/setup.py b/src/vm-repair/setup.py
index 588f1ff335e..c0dd567293b 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.5.5"
+VERSION = "0.5.6"
 
 CLASSIFIERS = [
     'Development Status :: 4 - Beta',