diff --git a/tools/dev_image_k5/Dockerfile b/tools/dev_image_k5/Dockerfile
index a148a596..14db3752 100644
--- a/tools/dev_image_k5/Dockerfile
+++ b/tools/dev_image_k5/Dockerfile
@@ -23,3 +23,12 @@ RUN     dpkg --remove kicost kibot && \
 # 	unzip pp.zip && \
 # 	pip3 install KiAuto-master/ && \
 # 	rm -rf KiAuto-master/ pp.zip && \
+
+ARG repo_hash
+ENV KIBOT_REPO_HASH=$repo_hash
+
+RUN     kibot --version | sed 's/.* \([0-9]\+\.[0-9]\+\.[0-9]\+\) .*/\1/' | tr -d '\n' > /etc/kiauto_tag && \
+	echo -n -${KIBOT_REPO_HASH}_k >> /etc/kiauto_tag && \
+	kicad_version.py >> /etc/kiauto_tag && \
+	echo -n _d >> /etc/kiauto_tag && \
+	cat /etc/debian_version | tr -d '\n' >> /etc/kiauto_tag
diff --git a/tools/dev_image_k5/build.sh b/tools/dev_image_k5/build.sh
index 8bb47f80..03e6f165 100755
--- a/tools/dev_image_k5/build.sh
+++ b/tools/dev_image_k5/build.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 set -e
-docker build -f Dockerfile -t ghcr.io/inti-cmnb/kicad5_auto:dev .
-TG1=`docker run --rm ghcr.io/inti-cmnb/kicad5_auto:dev kibot --version | sed 's/.* \([0-9]\+\.[0-9]\+\.[0-9]\+\) .*/\1/' | tr -d '\n'`
 HASH=`git log --pretty=format:%h -1 | tr -d '\n'`
+docker build -f Dockerfile --build-arg repo_hash=${HASH} -t ghcr.io/inti-cmnb/kicad5_auto:dev .
+TG1=`docker run --rm ghcr.io/inti-cmnb/kicad5_auto:dev kibot --version | sed 's/.* \([0-9]\+\.[0-9]\+\.[0-9]\+\) .*/\1/' | tr -d '\n'`
 TG2=k`docker run --rm ghcr.io/inti-cmnb/kicad5_auto:dev kicad_version.py`
 TG3=d`docker run --rm ghcr.io/inti-cmnb/kicad5_auto:dev cat /etc/debian_version | tr -d '\n'`
 docker tag ghcr.io/inti-cmnb/kicad5_auto:dev ghcr.io/inti-cmnb/kicad5_auto:dev_${TG1}-${HASH}_${TG2}_${TG3}
diff --git a/tools/dev_image_k5f/Dockerfile b/tools/dev_image_k5f/Dockerfile
index e1780d5e..27a34d6a 100644
--- a/tools/dev_image_k5f/Dockerfile
+++ b/tools/dev_image_k5f/Dockerfile
@@ -20,3 +20,15 @@ RUN     dpkg --remove kicost kibot && \
 # 	unzip pp.zip && \
 # 	pip3 install KiAuto-master/ && \
 # 	rm -rf KiAuto-master/ pp.zip && \
+
+ARG repo_hash
+ENV KIBOT_REPO_HASH=$repo_hash
+ENV KICAD_AUTO_FULL=1
+
+RUN     kibot --version | sed 's/.* \([0-9]\+\.[0-9]\+\.[0-9]\+\) .*/\1/' | tr -d '\n' > /etc/kiauto_tag && \
+	echo -n -${KIBOT_REPO_HASH}_k >> /etc/kiauto_tag && \
+	kicad_version.py >> /etc/kiauto_tag && \
+	echo -n _d >> /etc/kiauto_tag && \
+	cat /etc/debian_version | tr -d '\n' >> /etc/kiauto_tag && \
+	echo -n _b >> /etc/kiauto_tag && \
+	blender --version | head -n 1 | tr -d 'Blender ' >> /etc/kiauto_tag
diff --git a/tools/dev_image_k5f/build.sh b/tools/dev_image_k5f/build.sh
index fb0fcc33..2d11afa0 100755
--- a/tools/dev_image_k5f/build.sh
+++ b/tools/dev_image_k5f/build.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 set -e
-docker build -f Dockerfile -t ghcr.io/inti-cmnb/kicad5_auto_full:dev .
-TG1=`docker run --rm ghcr.io/inti-cmnb/kicad5_auto_full:dev kibot --version | sed 's/.* \([0-9]\+\.[0-9]\+\.[0-9]\+\) .*/\1/' | tr -d '\n'`
 HASH=`git log --pretty=format:%h -1 | tr -d '\n'`
+docker build -f Dockerfile --build-arg repo_hash=${HASH} -t ghcr.io/inti-cmnb/kicad5_auto_full:dev .
+TG1=`docker run --rm ghcr.io/inti-cmnb/kicad5_auto_full:dev kibot --version | sed 's/.* \([0-9]\+\.[0-9]\+\.[0-9]\+\) .*/\1/' | tr -d '\n'`
 TG2=k`docker run --rm ghcr.io/inti-cmnb/kicad5_auto_full:dev kicad_version.py`
 TG3=d`docker run --rm ghcr.io/inti-cmnb/kicad5_auto_full:dev cat /etc/debian_version | tr -d '\n'`
 TG4=b`docker run --rm ghcr.io/inti-cmnb/kicad5_auto_full:dev /bin/bash -c "blender --version | head -n 1 | tr -d 'Blender '"`
diff --git a/tools/dev_image_k6/Dockerfile b/tools/dev_image_k6/Dockerfile
index c39ad35a..b9736073 100644
--- a/tools/dev_image_k6/Dockerfile
+++ b/tools/dev_image_k6/Dockerfile
@@ -22,3 +22,12 @@ RUN     dpkg --remove kicost kibot && \
 # 	unzip pp.zip && \
 # 	pip3 install --break-system-packages KiAuto-master/ && \
 # 	rm -rf KiAuto-master/ pp.zip && \
+
+ARG repo_hash
+ENV KIBOT_REPO_HASH=$repo_hash
+
+RUN     kibot --version | sed 's/.* \([0-9]\+\.[0-9]\+\.[0-9]\+\) .*/\1/' | tr -d '\n' > /etc/kiauto_tag && \
+	echo -n -${KIBOT_REPO_HASH}_k >> /etc/kiauto_tag && \
+	kicad_version.py >> /etc/kiauto_tag && \
+	echo -n _d >> /etc/kiauto_tag && \
+	cat /etc/debian_version | tr -d '\n' >> /etc/kiauto_tag
diff --git a/tools/dev_image_k6/build.sh b/tools/dev_image_k6/build.sh
index d87b2575..fafcca25 100755
--- a/tools/dev_image_k6/build.sh
+++ b/tools/dev_image_k6/build.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 set -e
-docker build -f Dockerfile -t ghcr.io/inti-cmnb/kicad6_auto:dev .
-TG1=`docker run --rm ghcr.io/inti-cmnb/kicad6_auto:dev kibot --version | sed 's/.* \([0-9]\+\.[0-9]\+\.[0-9]\+\) .*/\1/' | tr -d '\n'`
 HASH=`git log --pretty=format:%h -1 | tr -d '\n'`
+docker build -f Dockerfile --build-arg repo_hash=${HASH} -t ghcr.io/inti-cmnb/kicad6_auto:dev .
+TG1=`docker run --rm ghcr.io/inti-cmnb/kicad6_auto:dev kibot --version | sed 's/.* \([0-9]\+\.[0-9]\+\.[0-9]\+\) .*/\1/' | tr -d '\n'`
 TG2=k`docker run --rm ghcr.io/inti-cmnb/kicad6_auto:dev kicad_version.py`
 TG3=d`docker run --rm ghcr.io/inti-cmnb/kicad6_auto:dev cat /etc/debian_version | tr -d '\n'`
 docker tag ghcr.io/inti-cmnb/kicad6_auto:dev ghcr.io/inti-cmnb/kicad6_auto:dev_${TG1}-${HASH}_${TG2}_${TG3}
diff --git a/tools/dev_image_k6f/Dockerfile b/tools/dev_image_k6f/Dockerfile
index 418f127c..f51f7d93 100644
--- a/tools/dev_image_k6f/Dockerfile
+++ b/tools/dev_image_k6f/Dockerfile
@@ -20,3 +20,15 @@ RUN     dpkg --remove kicost kibot && \
 # 	unzip pp.zip && \
 # 	pip3 install --break-system-packages KiAuto-master/ && \
 # 	rm -rf KiAuto-master/ pp.zip && \
+
+ARG repo_hash
+ENV KIBOT_REPO_HASH=$repo_hash
+ENV KICAD_AUTO_FULL=1
+
+RUN     kibot --version | sed 's/.* \([0-9]\+\.[0-9]\+\.[0-9]\+\) .*/\1/' | tr -d '\n' > /etc/kiauto_tag && \
+	echo -n -${KIBOT_REPO_HASH}_k >> /etc/kiauto_tag && \
+	kicad_version.py >> /etc/kiauto_tag && \
+	echo -n _d >> /etc/kiauto_tag && \
+	cat /etc/debian_version | tr -d '\n' >> /etc/kiauto_tag && \
+	echo -n _b >> /etc/kiauto_tag && \
+	blender --version | head -n 1 | tr -d 'Blender ' >> /etc/kiauto_tag
diff --git a/tools/dev_image_k6f/build.sh b/tools/dev_image_k6f/build.sh
index 6e92945a..ee5c181f 100755
--- a/tools/dev_image_k6f/build.sh
+++ b/tools/dev_image_k6f/build.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 set -e
-docker build -f Dockerfile -t ghcr.io/inti-cmnb/kicad6_auto_full:dev .
-TG1=`docker run --rm ghcr.io/inti-cmnb/kicad6_auto_full:dev kibot --version | sed 's/.* \([0-9]\+\.[0-9]\+\.[0-9]\+\) .*/\1/' | tr -d '\n'`
 HASH=`git log --pretty=format:%h -1 | tr -d '\n'`
+docker build -f Dockerfile --build-arg repo_hash=${HASH} -t ghcr.io/inti-cmnb/kicad6_auto_full:dev .
+TG1=`docker run --rm ghcr.io/inti-cmnb/kicad6_auto_full:dev kibot --version | sed 's/.* \([0-9]\+\.[0-9]\+\.[0-9]\+\) .*/\1/' | tr -d '\n'`
 TG2=k`docker run --rm ghcr.io/inti-cmnb/kicad6_auto_full:dev kicad_version.py`
 TG3=d`docker run --rm ghcr.io/inti-cmnb/kicad6_auto_full:dev cat /etc/debian_version | tr -d '\n'`
 TG4=b`docker run --rm ghcr.io/inti-cmnb/kicad6_auto_full:dev /bin/bash -c "blender --version | head -n 1 | tr -d 'Blender '"`
diff --git a/tools/dev_image_k7/Dockerfile b/tools/dev_image_k7/Dockerfile
index 8158f102..ac55f608 100644
--- a/tools/dev_image_k7/Dockerfile
+++ b/tools/dev_image_k7/Dockerfile
@@ -1,6 +1,6 @@
 FROM ghcr.io/inti-cmnb/kicad_auto:ki7
 MAINTAINER Salvador E. Tropea <stropea@inti.gob.ar>
-LABEL Description="KiCad 6 with KiBot and other automation scripts"
+LABEL Description="KiCad 7 with KiBot and other automation scripts"
 
 RUN     dpkg --remove kicost kibot && \
 	apt-get update && \
@@ -22,3 +22,12 @@ RUN     dpkg --remove kicost kibot && \
 # 	unzip pp.zip && \
 # 	pip3 install --break-system-packages KiAuto-master/ && \
 # 	rm -rf KiAuto-master/ pp.zip && \
+
+ARG repo_hash
+ENV KIBOT_REPO_HASH=$repo_hash
+
+RUN     kibot --version | sed 's/.* \([0-9]\+\.[0-9]\+\.[0-9]\+\) .*/\1/' | tr -d '\n' > /etc/kiauto_tag && \
+	echo -n -${KIBOT_REPO_HASH}_k >> /etc/kiauto_tag && \
+	kicad_version.py >> /etc/kiauto_tag && \
+	echo -n _d >> /etc/kiauto_tag && \
+	cat /etc/debian_version | tr -d '\n' >> /etc/kiauto_tag
diff --git a/tools/dev_image_k7/build.sh b/tools/dev_image_k7/build.sh
index e9baf622..8bfd28f6 100755
--- a/tools/dev_image_k7/build.sh
+++ b/tools/dev_image_k7/build.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 set -e
-docker build -f Dockerfile -t ghcr.io/inti-cmnb/kicad7_auto:dev .
-TG1=`docker run --rm ghcr.io/inti-cmnb/kicad7_auto:dev kibot --version | sed 's/.* \([0-9]\+\.[0-9]\+\.[0-9]\+\) .*/\1/' | tr -d '\n'`
 HASH=`git log --pretty=format:%h -1 | tr -d '\n'`
+docker build -f Dockerfile --build-arg repo_hash=${HASH} -t ghcr.io/inti-cmnb/kicad7_auto:dev .
+TG1=`docker run --rm ghcr.io/inti-cmnb/kicad7_auto:dev kibot --version | sed 's/.* \([0-9]\+\.[0-9]\+\.[0-9]\+\) .*/\1/' | tr -d '\n'`
 TG2=k`docker run --rm ghcr.io/inti-cmnb/kicad7_auto:dev kicad_version.py`
 TG3=d`docker run --rm ghcr.io/inti-cmnb/kicad7_auto:dev cat /etc/debian_version | tr -d '\n'`
 docker tag ghcr.io/inti-cmnb/kicad7_auto:dev ghcr.io/inti-cmnb/kicad7_auto:dev_${TG1}-${HASH}_${TG2}_${TG3}
diff --git a/tools/dev_image_k7f/Dockerfile b/tools/dev_image_k7f/Dockerfile
index 0ecaecef..6fedad3a 100644
--- a/tools/dev_image_k7f/Dockerfile
+++ b/tools/dev_image_k7f/Dockerfile
@@ -1,6 +1,6 @@
 FROM ghcr.io/inti-cmnb/kicad_auto_test:ki7
 MAINTAINER Salvador E. Tropea <stropea@inti.gob.ar>
-LABEL Description="KiCad 6 with KiBot and other automation scripts"
+LABEL Description="KiCad 7 with KiBot and other automation scripts"
 
 RUN     dpkg --remove kicost kibot && \
 	apt-get update && \
@@ -20,3 +20,15 @@ RUN     dpkg --remove kicost kibot && \
 # 	unzip pp.zip && \
 # 	pip3 install --break-system-packages KiAuto-master/ && \
 # 	rm -rf KiAuto-master/ pp.zip && \
+
+ARG repo_hash
+ENV KIBOT_REPO_HASH=$repo_hash
+ENV KICAD_AUTO_FULL=1
+
+RUN     kibot --version | sed 's/.* \([0-9]\+\.[0-9]\+\.[0-9]\+\) .*/\1/' | tr -d '\n' > /etc/kiauto_tag && \
+	echo -n -${KIBOT_REPO_HASH}_k >> /etc/kiauto_tag && \
+	kicad_version.py >> /etc/kiauto_tag && \
+	echo -n _d >> /etc/kiauto_tag && \
+	cat /etc/debian_version | tr -d '\n' >> /etc/kiauto_tag && \
+	echo -n _b >> /etc/kiauto_tag && \
+	blender --version | head -n 1 | tr -d 'Blender ' >> /etc/kiauto_tag
diff --git a/tools/dev_image_k7f/build.sh b/tools/dev_image_k7f/build.sh
index 1529cdaa..ade3290f 100755
--- a/tools/dev_image_k7f/build.sh
+++ b/tools/dev_image_k7f/build.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 set -e
-docker build -f Dockerfile -t ghcr.io/inti-cmnb/kicad7_auto_full:dev .
+export HASH=`git log --pretty=format:%h -1 | tr -d '\n'`
+docker build -f Dockerfile --build-arg repo_hash=${HASH} -t ghcr.io/inti-cmnb/kicad7_auto_full:dev .
 TG1=`docker run --rm ghcr.io/inti-cmnb/kicad7_auto_full:dev kibot --version | sed 's/.* \([0-9]\+\.[0-9]\+\.[0-9]\+\) .*/\1/' | tr -d '\n'`
-HASH=`git log --pretty=format:%h -1 | tr -d '\n'`
 TG2=k`docker run --rm ghcr.io/inti-cmnb/kicad7_auto_full:dev kicad_version.py`
 TG3=d`docker run --rm ghcr.io/inti-cmnb/kicad7_auto_full:dev cat /etc/debian_version | tr -d '\n'`
 TG4=b`docker run --rm ghcr.io/inti-cmnb/kicad7_auto_full:dev /bin/bash -c "blender --version | head -n 1 | tr -d 'Blender '"`