diff --git a/open-vm-tools.spec b/open-vm-tools.spec
index 341ddab..21f0e5a 100644
--- a/open-vm-tools.spec
+++ b/open-vm-tools.spec
@@ -32,7 +32,7 @@
 
 Name:             open-vm-tools
 Version:          %{toolsversion}
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          Open Virtual Machine Tools for virtual machines hosted on VMware
 License:          GPLv2
 URL:              https://github.com/vmware/%{name}
@@ -410,6 +410,11 @@ fi
 %{_bindir}/vmware-vgauth-smoketest
 
 %changelog
+* Wed Dec 06 2023 Miroslav Rezanina <mrezanin@redhat.com> - 12.3.5-2
+- ovt-Restart-tools-on-failure.patch [RHEL-17683]
+- Resolves: RHEL-17683
+  (Add Restart=on-failure to vmtoolsd.service [rhel-8])
+
 * Thu Nov 09 2023 Miroslav Rezanina <mrezanin@redhat.com> - 12.3.5-1
 - Rebase to 12.3.5 [RHEL-15059]
 - Fix CVE-2023-34058 [RHEL-14649]
diff --git a/vmtoolsd.service b/vmtoolsd.service
index b0984be..7d1bb2f 100644
--- a/vmtoolsd.service
+++ b/vmtoolsd.service
@@ -6,10 +6,13 @@ Requires=vgauthd.service
 After=vgauthd.service
 DefaultDependencies=no
 Before=cloud-init-local.service
+StartLimitIntervalSec=30
+StartLimitBurst=3
 
 [Service]
 ExecStart=/usr/bin/vmtoolsd
 TimeoutStopSec=5
+Restart=on-failure
 
 [Install]
 WantedBy=multi-user.target