diff --git a/Dockerfile-nightly b/Dockerfile-nightly
new file mode 100644
index 0000000..726bd63
--- /dev/null
+++ b/Dockerfile-nightly
@@ -0,0 +1,45 @@
+FROM setsoft/kicad_debian:nightly
+MAINTAINER Salvador E. Tropea <set@ieee.org>
+LABEL Description="KiCad with KiBot and other automation scripts"
+
+COPY kicad-automation-scripts*.deb /
+RUN     apt-get update  && \
+	apt -y install --no-install-recommends ./kicad-automation-scripts*.deb && \
+	apt-get -y autoremove && \
+	rm /*.deb && \
+	rm -rf /var/lib/apt/lists/*
+
+COPY kibom*.deb /
+RUN     apt-get update  && \
+	apt -y install --no-install-recommends ./kibom*.deb && \
+	apt-get -y autoremove && \
+	rm /*.deb && \
+	rm -rf /var/lib/apt/lists/*
+
+COPY interactivehtmlbom*.deb /
+RUN     apt-get update  && \
+	apt -y install --no-install-recommends ./interactivehtmlbom*.deb && \
+	apt-get -y autoremove && \
+	rm /*.deb && \
+	rm -rf /var/lib/apt/lists/*
+
+COPY pcbdraw*.deb *pybars*.deb *pymeta*.deb  /
+RUN     apt-get update  && \
+	apt -y install --no-install-recommends ./pcbdraw*.deb ./*pybars*.deb ./*pymeta*.deb && \
+	apt-get -y autoremove && \
+	rm /*.deb && \
+	rm -rf /var/lib/apt/lists/*
+
+COPY kibot*.deb /
+RUN     apt-get update  && \
+	apt-get -y install --no-install-recommends imagemagick librsvg2-bin && \
+	apt -y install ./kibot*.deb && \
+	apt-get -y autoremove && \
+	rm /*.deb && \
+	rm -rf /var/lib/apt/lists/*
+
+RUN     apt-get update  && \
+	apt-get -y install --no-install-recommends make && \
+	apt-get -y autoremove && \
+	rm -rf /var/lib/apt/lists/*
+
diff --git a/Makefile b/Makefile
index 6bdb924..7a9a40e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 #!/usr/bin/make
 tagname = 10.4-5.1.6
 tagname_rc = 10.4-5.1.6rc
+tagname_ng = bullseye-5.99-20200922
 docker_user = setsoft
 docker_img = setsoft/kicad_auto
 
@@ -18,6 +19,10 @@ build: download_packages
 build_rc:
 	docker build -f Dockerfile -t $(docker_img):$(tagname_rc) .
 
+build_ng:
+	docker build -f Dockerfile-nightly -t $(docker_img):$(tagname_ng) .
+	docker build -f Dockerfile-nightly -t $(docker_img):nightly .
+
 upload_image:
 	#docker login --username=$(docker_user)
 	docker push $(docker_img):$(tagname)
@@ -26,10 +31,16 @@ upload_image:
 upload_image_rc:
 	docker push $(docker_img):$(tagname_rc)
 
+upload_image_ng:
+	docker push $(docker_img):$(tagname_ng)
+	docker push $(docker_img):nightly
+
 release: build upload_image
 
 release_rc: build_rc upload_image_rc
 
+release_ng: build_ng upload_image_ng
+
 # If docker is not installed in the host system
 install_docker:
 	sudo apt install docker.io
diff --git a/README.md b/README.md
index 0d5b816..3c2eed0 100644
--- a/README.md
+++ b/README.md
@@ -18,6 +18,7 @@ The available tags are:
 
 * **10.3-5.1.5** is KiCad 5.1.5 on Debian 10.3 with Kiplot 0.2.4, kicad-automation-scripts 1.3.1, KiBoM 1.6.3 and interactivehtmlbom 2.3.1
 * **10.4-5.1.6** (same as **latest**) is KiCad 5.1.6 on Debian 10.4 with KiBot 0.7.0, kicad-automation-scripts 1.4.2, KiBoM 1.8.0, interactivehtmlbom 2.3.3 and PcbDraw 0.6.0-2
+* **bullseye-5.99-20200922** (same as **nightly**) is KiCad 5.99 (20200922) on Debian bullseye with KiBot 0.7.0, kicad-automation-scripts 1.4.2, KiBoM 1.8.0, interactivehtmlbom 2.3.3 and PcbDraw 0.6.0-2
 
 You can run it using a script like this: