diff --git a/docker/librewolf/debian/Makefile b/docker/librewolf/debian/Makefile
index 5d687a5..58802ad 100644
--- a/docker/librewolf/debian/Makefile
+++ b/docker/librewolf/debian/Makefile
@@ -1,2 +1,2 @@
 all :
-	sudo docker build -t mozilla/nightly-debian .
+	sudo docker build -t librewolf/release-debian .
diff --git a/docker/librewolf/fedora/Makefile b/docker/librewolf/fedora/Makefile
index b45f231..f288ec0 100644
--- a/docker/librewolf/fedora/Makefile
+++ b/docker/librewolf/fedora/Makefile
@@ -1,2 +1,2 @@
 all :
-	sudo docker build -t mozilla/nightly-fedora .
+	sudo docker build -t librewolf/release-fedora .
diff --git a/docker/librewolf/mint/Makefile b/docker/librewolf/mint/Makefile
index e3f584f..d7a853f 100644
--- a/docker/librewolf/mint/Makefile
+++ b/docker/librewolf/mint/Makefile
@@ -1,2 +1,2 @@
 all :
-	sudo docker build -t mozilla/nightly-mint .
+	sudo docker build -t librewolf/release-mint .
diff --git a/docker/librewolf/ubuntu/Makefile b/docker/librewolf/ubuntu/Makefile
index 1cd815d..03cf88a 100644
--- a/docker/librewolf/ubuntu/Makefile
+++ b/docker/librewolf/ubuntu/Makefile
@@ -1,2 +1,2 @@
 all :
-	sudo docker build -t mozilla/nightly-ubuntu .
+	sudo docker build -t librewolf/release-ubuntu .
diff --git a/docker/nightly/Dockerfile.apiserver b/docker/nightly/Dockerfile.apiserver
new file mode 100644
index 0000000..53cd610
--- /dev/null
+++ b/docker/nightly/Dockerfile.apiserver
@@ -0,0 +1,8 @@
+RUN dnf -y install g++ gcc make automake autoconf libtool libcurl-devel
+COPY apiserver-0.1.1.tar.gz /
+WORKDIR /
+RUN tar xvf apiserver-0.1.1.tar.gz
+WORKDIR apiserver-0.1.1
+RUN zsh ./configure --prefix=/usr --disable-dependency-tracking
+RUN ["make", "install"]
+RUN ["make", "dist"]
diff --git a/docker/nightly/debian/Dockerfile b/docker/nightly/debian/Dockerfile
index d735403..bb62f9a 100644
--- a/docker/nightly/debian/Dockerfile
+++ b/docker/nightly/debian/Dockerfile
@@ -10,4 +10,4 @@ run wget -q https://hg.mozilla.org/mozilla-central/raw-file/default/python/mozbo
 run python3 bootstrap.py --no-interactive --application-choice=browser
 
 # Build it..
-copy version /
+
diff --git a/docker/nightly/fedora/Dockerfile b/docker/nightly/fedora/Dockerfile
index 8b02475..38541da 100644
--- a/docker/nightly/fedora/Dockerfile
+++ b/docker/nightly/fedora/Dockerfile
@@ -14,4 +14,3 @@ run wget -q https://hg.mozilla.org/mozilla-central/raw-file/default/python/mozbo
 run echo python3 bootstrap.py --no-interactive --application-choice=browser
 
 # Build it..
-copy version /
diff --git a/docker/nightly/mint/Dockerfile b/docker/nightly/mint/Dockerfile
index 10c778c..622947b 100644
--- a/docker/nightly/mint/Dockerfile
+++ b/docker/nightly/mint/Dockerfile
@@ -10,5 +10,5 @@ run wget -q https://hg.mozilla.org/mozilla-central/raw-file/default/python/mozbo
 run python3 bootstrap.py --no-interactive --application-choice=browser
 
 # Build it..
-copy version /
+
 
diff --git a/docker/nightly/ubuntu/Dockerfile b/docker/nightly/ubuntu/Dockerfile
index 5ed1229..9aeef25 100644
--- a/docker/nightly/ubuntu/Dockerfile
+++ b/docker/nightly/ubuntu/Dockerfile
@@ -10,4 +10,3 @@ run wget -q https://hg.mozilla.org/mozilla-central/raw-file/default/python/mozbo
 run python3 bootstrap.py --no-interactive --application-choice=browser
 
 # Build it..
-copy version /
diff --git a/docker/nightly/version b/docker/nightly/version
deleted file mode 100644
index 34de4d2..0000000
--- a/docker/nightly/version
+++ /dev/null
@@ -1 +0,0 @@
-92.0.1