diff --git a/.gitignore b/.gitignore
index ceea83d..43b6509 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,5 @@ build_tag
 /docker/librewolf/fedora34/rpm/artifacts
 /docker/librewolf/mint20/deb/artifacts
 /docker/librewolf/ubuntu20/deb/artifacts
+/docker/*.log
+version
diff --git a/docker/Makefile b/docker/Makefile
index 425af63..687bdbb 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -1,57 +1,59 @@
-all : lw
+all :
+	cp version librewolf
+	make debian10 debian11 fedora34 mint20 ubuntu20
 
 help :
 	@echo "Use: make all clean lw prune mozilla full"
 	@echo "     make debian10 debian11 fedora34 mint20 ubuntu20"
+	@echo "     make low-disk-full-build upload-logs"
 
 clean :
 	rm -f librewolf/version release/version
-
 	make -C librewolf clean
 	make -C release clean
 
-lw :
-	cp version librewolf
-
-	make -C buildenv
-	make -C librewolf
+veryclean : clean
+	rm -f *.log
 
 mozilla :
 	cp version release
-
 	make -C buildenv
 	make -C nightly
 	make -C release
 
-prune :
-	sudo docker system prune --all --force
-
-madman : prune lw mozilla
 
+###
 
 
 debian10 :
-	make -C buildenv/debian10
+	script -O ubuntu20.build.env.log -c "time make -C buildenv/debian10"
 	cp version librewolf/debian10
-	make -C librewolf/debian10
-debian11 :
-	make -C buildenv/debian11
-	cp version librewolf/debian11
-	make -C librewolf/debian11
-fedora34 :
-	make -C buildenv/fedora34
-	cp version librewolf/fedora34
-	make -C librewolf/fedora34
-mint20 :
-	make -C buildenv/mint20
-	cp version librewolf/mint20
-	make -C librewolf/mint20
-ubuntu20 :
-	make -C buildenv/ubuntu20
-	cp version librewolf/ubuntu20
-	make -C librewolf/ubuntu20
+	script -O ubuntu20.build.app.log -c "time make -C librewolf/debian10"
 
-low_disk :
+debian11 :
+	script -O ubuntu20.build.env.log -c "time make -C buildenv/debian11"
+	cp version librewolf/debian11
+	script -O ubuntu20.build.app.log -c "time make -C librewolf/debian11"
+
+fedora34 :
+	script -O ubuntu20.build.env.log -c "time make -C buildenv/fedora34"
+	cp version librewolf/fedora34
+	script -O ubuntu20.build.app.log -c "time make -C librewolf/fedora34"
+
+mint20 :
+	script -O ubuntu20.build.env.log -c "time make -C buildenv/mint20"
+	cp version librewolf/mint20
+	script -O ubuntu20.build.app.log -c "time make -C librewolf/mint20"
+
+ubuntu20 :
+	script -O ubuntu20.build.env.log -c "time make -C buildenv/ubuntu20"
+	cp version librewolf/ubuntu20
+	script -O ubuntu20.build.app.log -c "time make -C librewolf/ubuntu20"
+
+
+
+
+low-disk-full-build :
 	cp version librewolf
 
 	make prune
@@ -65,3 +67,9 @@ low_disk :
 	make prunt
 	make ubuntu20
 	make prune
+
+upload-logs :
+	scp *.log vps:pub/pub/librewolf/buildlogs
+
+prune :
+	sudo docker system prune --all --force
diff --git a/docker/buildenv/fedora34/Dockerfile b/docker/buildenv/fedora34/Dockerfile
index ef7ddcc..1cbbb75 100644
--- a/docker/buildenv/fedora34/Dockerfile
+++ b/docker/buildenv/fedora34/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora
+FROM fedora:34
 MAINTAINER Bert van der Weerd <bert@stanzabird.nl>
 RUN dnf -y update
 
diff --git a/docker/buildenv/ubuntu20/Dockerfile b/docker/buildenv/ubuntu20/Dockerfile
index aa4c81e..8127f38 100644
--- a/docker/buildenv/ubuntu20/Dockerfile
+++ b/docker/buildenv/ubuntu20/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu
+FROM ubuntu:20.04
 MAINTAINER Bert van der Weerd <bert@stanzabird.nl>
 ENV DEBIAN_FRONTEND=noninteractive
 ENV TZ=Europe/Amsterdam