diff --git a/Dockerfile_dk8 b/Dockerfile_dk8
new file mode 100644
index 00000000..38844cd2
--- /dev/null
+++ b/Dockerfile_dk8
@@ -0,0 +1,10 @@
+FROM ghcr.io/inti-cmnb/kicad8_auto_full:dev
+LABEL AUTHOR Salvador E. Tropea <stropea@inti.gob.ar>
+LABEL Description="Export various files from KiCad projects (KiCad 8 + development)"
+
+COPY entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+
+WORKDIR /mnt
+
+ENTRYPOINT [ "/entrypoint.sh" ]
diff --git a/Dockerfile_k8 b/Dockerfile_k8
new file mode 100644
index 00000000..3cb3b755
--- /dev/null
+++ b/Dockerfile_k8
@@ -0,0 +1,10 @@
+FROM ghcr.io/inti-cmnb/kicad8_auto_full:latest
+LABEL AUTHOR Salvador E. Tropea <stropea@inti.gob.ar>
+LABEL Description="Export various files from KiCad projects (KiCad 8)"
+
+COPY entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+
+WORKDIR /mnt
+
+ENTRYPOINT [ "/entrypoint.sh" ]
diff --git a/Makefile b/Makefile
index e42067aa..dab81710 100644
--- a/Makefile
+++ b/Makefile
@@ -282,6 +282,16 @@ update_gha:
 	git push
 	git tag -f -a v2_k7 -m "GitHub Action v2 for KiCad 7"
 	git push origin -f --tags
+	cp Dockerfile_dk8 Dockerfile
+	git commit -m "[CI/CD] Updating Github Action v2 for KiCad 8 development" Dockerfile
+	git push
+	git tag -f -a v2_dk8 -m "GitHub Action v2 for KiCad 8 (development)"
+	git push origin -f --tags
+	cp Dockerfile_k8 Dockerfile
+	git commit -m "[CI/CD] Updating Github Action v2 for KiCad 8 latest" Dockerfile
+	git push
+	git tag -f -a v2_k8 -m "GitHub Action v2 for KiCad 8"
+	git push origin -f --tags
 
 
 .PHONY: deb deb_clean lint test test_local gen_ref doc py_build pypi_upload py_clean