diff --git a/packer/ansible/roles/docker/files/docker-setup.sh b/packer/ansible/roles/docker/files/docker-setup.sh
index 97a5af2..9fd7e8c 100755
--- a/packer/ansible/roles/docker/files/docker-setup.sh
+++ b/packer/ansible/roles/docker/files/docker-setup.sh
@@ -2,6 +2,14 @@
 
 vg='vglab'
 
+# nothing needs to be done if previous data in overlay present
+[ -d /var/lib/docker ] && exit 0
+
+# remove LV if exists
+if lvs $vg/docker-thinpool > /dev/null 2>&1; then
+	lvremove -y $vg/docker-thinpool
+fi
+
 if ! lvs -o layout --noheadings $vg/docker-thinpool | grep -q 'thin,pool'; then
 
 	if ! lvs -o LV_NAME --noheadings | grep -q docker-thinpool; then
@@ -46,15 +54,4 @@ cat > /etc/docker/daemon.json << EOF
     ]
 }
 EOF
-
-
-if ! [ -e /var/lib/docker/devicemapper/metadata/base ]; then
-	mkdir -p /var/lib/docker/devicemapper/metadata
-
-	echo '{"device_id":1,"size":10737418240,"transaction_id":1,"initialized":true,"deleted":false}' > /var/lib/docker/devicemapper/metadata/base
-
-	chmod 711 /var/lib/docker
-	chmod 700 /var/lib/docker/devicemapper
-	chmod 700 /var/lib/docker/devicemapper/metadata
-	chmod 600 /var/lib/docker/devicemapper/metadata/base
-fi
+mkdir -m 711 /var/lib/docker
diff --git a/packer/debian-stretch.json b/packer/debian-stretch.json
index 2587fa6..f2f0778 100644
--- a/packer/debian-stretch.json
+++ b/packer/debian-stretch.json
@@ -99,6 +99,7 @@
 		  "echo '/etc/resolv.conf' >> /tmp/ignore_files",
 		  "echo '/etc/hostname' >> /tmp/ignore_files",
 		  "echo '/etc/hosts' >> /tmp/ignore_files",
+		  "echo '/var/lib/docker' >> /tmp/ignore_files",
 		  "mkdir -p /tmp/extra/tmp /tmp/extra/proc /tmp/extra/sys /tmp/extra/etc"
 	  ]
 	},