diff --git a/actions/infinoted b/actions/infinoted
index f0229e906..7da3c7dd4 100755
--- a/actions/infinoted
+++ b/actions/infinoted
@@ -94,6 +94,24 @@ After=network.target
 User=infinoted
 Group=infinoted
 ExecStart=/usr/bin/infinoted
+ConfigurationDirectory=infinoted
+ConfigurationDirectoryMode=0750
+LockPersonality=yes
+NoNewPrivileges=yes
+PrivateDevices=yes
+PrivateMounts=yes
+PrivateTmp=yes
+PrivateUsers=yes
+ProtectControlGroups=yes
+ProtectHome=yes
+ProtectKernelLogs=yes
+ProtectKernelModules=yes
+ProtectKernelTunables=yes
+ProtectSystem=full
+RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6
+RestrictRealtime=yes
+StateDirectory=infinoted
+SystemCallArchitectures=native
 
 [Install]
 WantedBy=multi-user.target
@@ -130,11 +148,10 @@ def subcommand_setup(_):
         with open(CONF_PATH, 'w') as file_handle:
             file_handle.write(CONF)
 
-    if not os.path.isfile(SYSTEMD_SERVICE_PATH):
-        with open(SYSTEMD_SERVICE_PATH, 'w') as file_handle:
-            file_handle.write(SYSTEMD_SERVICE)
+    with open(SYSTEMD_SERVICE_PATH, 'w') as file_handle:
+        file_handle.write(SYSTEMD_SERVICE)
 
-        subprocess.check_call(['systemctl', 'daemon-reload'])
+    subprocess.check_call(['systemctl', 'daemon-reload'])
 
     # Create infinoted group if needed.
     try:
diff --git a/plinth/modules/infinoted/__init__.py b/plinth/modules/infinoted/__init__.py
index 3fd97f921..133b209e4 100644
--- a/plinth/modules/infinoted/__init__.py
+++ b/plinth/modules/infinoted/__init__.py
@@ -31,7 +31,7 @@ from plinth.views import AppView
 
 from .manifest import backup, clients  # noqa, pylint: disable=unused-import
 
-version = 1
+version = 2
 
 managed_services = ['infinoted']