diff --git a/open-vm-tools.spec b/open-vm-tools.spec
index 9c94547..fa48194 100644
--- a/open-vm-tools.spec
+++ b/open-vm-tools.spec
@@ -28,7 +28,7 @@
 
 Name:             open-vm-tools
 Version:          %{toolsversion}
-Release:          2%{?dist}
+Release:          3%{?dist}
 Summary:          Open Virtual Machine Tools for virtual machines hosted on VMware
 License:          GPLv2
 URL:              https://github.com/vmware/%{name}
@@ -222,6 +222,18 @@ if [ -f %{_bindir}/vmware-checkvm -a                     \
    mkdir -p /mnt/hgfs
 fi
 
+if [ "$1" = "2" ]; then
+   # Cleanup GuestProxy certs, relevant for upgrades only
+   if [ -f %{_bindir}/vmware-guestproxycerttool ]; then
+      %{_bindir}/vmware-guestproxycerttool -e &> /dev/null || /bin/true
+   fi
+   if [ -d /etc/vmware-tools/GuestProxyData ]; then
+      rm -rf /etc/vmware-tools/GuestProxyData &> /dev/null || /bin/true
+   fi
+
+   # Cleanup vmtoolsd-init.service in case of upgrades
+   %{_bindir}/systemctl disable %{toolsdaemon}-init.service &> /dev/null || /bin/true
+fi
 %systemd_post %{vgauthdaemon}.service
 %systemd_post %{toolsdaemon}.service
 
@@ -316,6 +328,10 @@ fi
 %{_bindir}/vmware-vgauth-smoketest
 
 %changelog
+* Wed Oct 09 2019 Ravindra Kumar <ravindrakumar@vmware.com> - 11.0.0-3
+- Cleanup GuestProxy certs from /etc/vmware-tools/GuestProxyData if needed.
+- Cleanup vmtoolsd-init service symlinks.
+
 * Wed Oct 02 2019 Ravindra Kumar <ravindrakumar@vmware.com> - 11.0.0-2
 - vmtoolsd-init.service is no longer needed for 11.0.0, removed it.