diff --git a/kubeadm.conf b/kubeadm.conf
index 2024469..1f8d5e4 100644
--- a/kubeadm.conf
+++ b/kubeadm.conf
@@ -7,3 +7,6 @@ Environment="KUBELET_AUTHZ_ARGS=--authorization-mode=Webhook --client-ca-file=/e
 Environment="KUBELET_EXTRA_ARGS=--cgroup-driver=systemd"
 ExecStart=
 ExecStart=/usr/bin/kubelet $KUBELET_KUBECONFIG_ARGS $KUBELET_SYSTEM_PODS_ARGS $KUBELET_NETWORK_ARGS $KUBELET_DNS_ARGS $KUBELET_AUTHZ_ARGS $KUBELET_EXTRA_ARGS
+Restart=always
+StartLimitInterval=0
+RestartSec=10
diff --git a/kubernetes.spec b/kubernetes.spec
index 8934d8d..017b88b 100644
--- a/kubernetes.spec
+++ b/kubernetes.spec
@@ -45,7 +45,7 @@
 ##############################################
 Name:           kubernetes
 Version:        %{kube_version}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Container cluster management
 License:        ASL 2.0
 URL:            https://%{import_path}
@@ -1146,6 +1146,9 @@ fi
 
 ############################################
 %changelog
+* Mon Jul 24 2017 Jan Chaloupka <jchaloup@redhat.com> - 1.7.1-2
+- Sync kubeadm.conf with upstream service configuration (set Restart,StartLimitInterval,RestartSec)
+
 * Fri Jul 14 2017 Jan Chaloupka <jchaloup@redhat.com> - 1.7.1-1
 - Update to upstream v1.7.1
   resolves: #1471767