diff --git a/Dockerfile b/Dockerfile
index 05fd474..9e025c5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM setsoft/kicad_debian:latest
+FROM ghcr.io/inti-cmnb/kicad5_debian:latest
 MAINTAINER Salvador E. Tropea <set@ieee.org>
 LABEL Description="KiCad with KiBot and other automation scripts"
 
diff --git a/ki6/Dockerfile b/ki6/Dockerfile
index 5906f06..eaa6db9 100644
--- a/ki6/Dockerfile
+++ b/ki6/Dockerfile
@@ -1,4 +1,4 @@
-FROM setsoft/kicad_debian:ki6
+FROM ghcr.io/inti-cmnb/kicad6_debian:latest
 MAINTAINER Salvador E. Tropea <set@ieee.org>
 LABEL Description="KiCad with KiBot and other automation scripts"