diff --git a/stack_orchestrator/deploy/k8s/helpers.py b/stack_orchestrator/deploy/k8s/helpers.py
index fa5b4141..76a216cb 100644
--- a/stack_orchestrator/deploy/k8s/helpers.py
+++ b/stack_orchestrator/deploy/k8s/helpers.py
@@ -207,14 +207,19 @@ except: pass
         docker stop laconic-etcd-cleanup
         docker rm laconic-etcd-cleanup
 
-        # Replace original etcd
-        docker run --rm -v {etcd_path}:/etcd $ALPINE_IMAGE rm -rf /etcd/member
+        # Restore to temp location first to verify it works
         docker run --rm \
             -v {temp_dir}/etcd-data/cleaned-snapshot.db:/data/db:ro \
-            -v {etcd_path}:/restore \
+            -v {temp_dir}:/restore \
             {etcd_image} \
-            etcdutl snapshot restore /data/db --data-dir=/restore --skip-hash-check \
-            2>/dev/null
+            etcdutl snapshot restore /data/db --data-dir=/restore/new-etcd \
+            --skip-hash-check 2>/dev/null
+
+        # Only after successful restore, swap directories
+        docker run --rm -v {etcd_path}:/etcd -v {temp_dir}:/tmp-work $ALPINE_IMAGE \
+            sh -c "mv /etcd/member /etcd/member.bak && \
+                   mv /tmp-work/new-etcd/member /etcd/member && \
+                   rm -rf /etcd/member.bak"
 
         # Cleanup
         docker run --rm -v /tmp:/tmp $ALPINE_IMAGE rm -rf {temp_dir}