diff --git a/modules/mesh-recovery/.gitignore b/modules/mesh-recovery/.gitignore
index 1b8d4339c..0135b2410 100644
--- a/modules/mesh-recovery/.gitignore
+++ b/modules/mesh-recovery/.gitignore
@@ -1,3 +1,4 @@
 /mesh-recovery
 /cmd/mesh-recovery/mesh-recovery
 /cmd/mesh-recovery-tools/mesh-recovery-tools
+/mesh-recovery-tools
diff --git a/modules/mesh-recovery/files/dump-wait-minutes b/modules/mesh-recovery/files/dump-wait-minutes
new file mode 100644
index 000000000..bcb00821f
--- /dev/null
+++ b/modules/mesh-recovery/files/dump-wait-minutes
@@ -0,0 +1 @@
+${config:dump-wait-minutes}
diff --git a/modules/mesh-recovery/files/point-keep-days b/modules/mesh-recovery/files/point-keep-days
new file mode 100644
index 000000000..02af64917
--- /dev/null
+++ b/modules/mesh-recovery/files/point-keep-days
@@ -0,0 +1 @@
+${config:point-keep-days}
diff --git a/modules/mesh-recovery/files/points-cap b/modules/mesh-recovery/files/points-cap
new file mode 100644
index 000000000..cbe82190d
--- /dev/null
+++ b/modules/mesh-recovery/files/points-cap
@@ -0,0 +1 @@
+${config:points-cap}
diff --git a/modules/mesh-recovery/files/points-filling-mark b/modules/mesh-recovery/files/points-filling-mark
new file mode 100644
index 000000000..da03c7e78
--- /dev/null
+++ b/modules/mesh-recovery/files/points-filling-mark
@@ -0,0 +1 @@
+${config:points-filling-mark}
diff --git a/modules/mesh-recovery/module.json b/modules/mesh-recovery/module.json
index 5f502377f..fb68370b5 100644
--- a/modules/mesh-recovery/module.json
+++ b/modules/mesh-recovery/module.json
@@ -162,7 +162,7 @@
       "path": "${dir:state}/points-cap",
       "owner": "mesh-recovery",
       "mode": "0600",
-      "content": "${config:points-cap}"
+      "template": "files/points-cap"
     },
     {
       "id": "mark",
@@ -170,7 +170,7 @@
       "path": "${dir:state}/points-filling-mark",
       "owner": "mesh-recovery",
       "mode": "0600",
-      "content": "${config:points-filling-mark}"
+      "template": "files/points-filling-mark"
     },
     {
       "id": "keep-days",
@@ -178,7 +178,7 @@
       "path": "${dir:state}/point-keep-days",
       "owner": "mesh-recovery",
       "mode": "0600",
-      "content": "${config:point-keep-days}"
+      "template": "files/point-keep-days"
     },
     {
       "id": "dump-wait",
@@ -186,7 +186,7 @@
       "path": "${dir:state}/dump-wait-minutes",
       "owner": "mesh-recovery",
       "mode": "0600",
-      "content": "${config:dump-wait-minutes}"
+      "template": "files/dump-wait-minutes"
     },
     {
       "id": "recovery",
@@ -262,6 +262,11 @@
         "loads": [
           "mesh-recovery-tools"
         ]
+      },
+      {
+        "name": "files",
+        "kind": "archive",
+        "from": "files"
       }
     ]
   }