diff --git a/repo/modules/services/openmesh/xnode/admin.nix b/repo/modules/services/openmesh/xnode/admin.nix
index 87a993cd69012..bc29ad7115281 100644
--- a/repo/modules/services/openmesh/xnode/admin.nix
+++ b/repo/modules/services/openmesh/xnode/admin.nix
@@ -53,10 +53,10 @@ in
       wants = [ "network-online.target" ];
 
       serviceConfig = {
+        ExecStartPre = ''/bin/sh -c 'test -d ${cfg.stateDir}/xnodeos/.git || ${lib.getExe pkgs.git} clone --branch feature/xnode-admin-service https://github.com/openmesh-network/xnodeos ${cfg.stateDir}/xnodeos' '';
         ExecStart = ''${lib.getExe cfg.package} --remote ${cfg.remoteDir} ${cfg.stateDir}''; 
-        ExecStartPre = ''-${lib.getExe pkgs.git} clone --branch feature/xnode-admin-service https://github.com/openmesh-network/xnodeos ${cfg.stateDir}/xnodeos'';
-        ExecCondition = ''-${lib.getExe pkgs.git} pull --branch feature/xnode-admin-service https://github.com/openmesh-network/xnodeos ${cfg.stateDir}/xnodeos'';   
         Restart = "always";
+        RestartSec = 5;
         WorkingDirectory = cfg.stateDir;
         StateDirectory = "openmesh-xnode-admin";
         StateDirectoryMode = "0775";