diff --git a/build__common.sh b/build__common.sh
index f256aa9..0f8625a 100644
--- a/build__common.sh
+++ b/build__common.sh
@@ -28,9 +28,6 @@ common_start() {
         # some targets might use idhub1 and/or idhub2
         idhub1="${idhub1:-idhub1__${target}}"
         idhub2="${idhub2:-idhub2__${target}}"
-
-        # force recreate
-        rm -rf "./${idhub1}" "./${idhub2}"
 }
 
 common_end() {
diff --git a/build__instance-autotest.sh b/build__instance-autotest.sh
index 1f3b558..6e31567 100755
--- a/build__instance-autotest.sh
+++ b/build__instance-autotest.sh
@@ -19,6 +19,9 @@ main() {
 
         common_start
 
+        # no data persistence: cleanup previous possible data
+        rm -rf "./${idhub1}" "./${idhub2}"
+
         # detect if is new
         if [ ! -f "./${idhub1}" ]; then
                 echo 'Detected new deployment, recreating idhub git repo'