diff --git a/2.3.3/Dockerfile b/2.3.3/Dockerfile
deleted file mode 100644
index c1410ca..0000000
--- a/2.3.3/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM alpine:3.3
-
-ENV ICECAST_VERSION 2.3.3
-
-RUN \
-	apk --update add build-base openssl libvorbis opus libogg speex libtheora curl &&\
-	curl http://downloads.xiph.org/releases/icecast/icecast-${ICECAST_VERSION}.tar.gz |\
-		tar xz -C /tmp &&\
-	cd /tmp/icecast-${ICECAST_VERSION} &&\
-	./configure --enable-static &&\
-	make &&\
-	make install &&\
-	apk del build-base &&\
-	cd $HOME &&\
-	rm -rf /tmp/* /var/cache/apk/* &&\
-	addgroup -g 9999 icecast &&\
-	adduser -S -D -H -u 9999 -G 9999 -s /bin/false icecast &&\
-
-USER 9999
-VOLUME [ "/data" ]
-CMD [ "/usr/local/bin/icecast", "-c", "/data/icecast.xml" ]
-EXPOSE 8000
diff --git a/2.4 b/2.4
deleted file mode 120000
index 6550da6..0000000
--- a/2.4
+++ /dev/null
@@ -1 +0,0 @@
-2.4.3
\ No newline at end of file
diff --git a/2.4.0/Dockerfile b/2.4.0/Dockerfile
deleted file mode 100644
index 7ce8e3d..0000000
--- a/2.4.0/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM alpine:3.3
-
-ENV ICECAST_VERSION 2.4.0
-
-RUN \
-	apk --update add build-base openssl libvorbis opus libogg speex libtheora curl &&\
-	curl http://downloads.xiph.org/releases/icecast/icecast-${ICECAST_VERSION}.tar.gz |\
-		tar xz -C /tmp &&\
-	cd /tmp/icecast-${ICECAST_VERSION} &&\
-	./configure --enable-static &&\
-	make &&\
-	make install &&\
-	apk del build-base &&\
-	cd $HOME &&\
-	rm -rf /tmp/* /var/cache/apk/* &&\
-	addgroup -g 9999 icecast &&\
-	adduser -S -D -H -u 9999 -G 9999 -s /bin/false icecast &&\
-
-USER 9999
-VOLUME [ "/data" ]
-CMD [ "/usr/local/bin/icecast", "-c", "/data/icecast.xml" ]
-EXPOSE 8000
diff --git a/2.4.1/Dockerfile b/2.4.1/Dockerfile
deleted file mode 100644
index 4853c77..0000000
--- a/2.4.1/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM alpine:3.3
-
-ENV ICECAST_VERSION 2.4.1
-
-RUN \
-	apk --update add build-base openssl libvorbis opus libogg speex libtheora curl &&\
-	curl http://downloads.xiph.org/releases/icecast/icecast-${ICECAST_VERSION}.tar.gz |\
-		tar xz -C /tmp &&\
-	cd /tmp/icecast-${ICECAST_VERSION} &&\
-	./configure --enable-static &&\
-	make &&\
-	make install &&\
-	apk del build-base &&\
-	cd $HOME &&\
-	rm -rf /tmp/* /var/cache/apk/* &&\
-	addgroup -g 9999 icecast &&\
-	adduser -S -D -H -u 9999 -G 9999 -s /bin/false icecast &&\
-
-USER 9999
-VOLUME [ "/data" ]
-CMD [ "/usr/local/bin/icecast", "-c", "/data/icecast.xml" ]
-EXPOSE 8000
diff --git a/2.4.2/Dockerfile b/2.4.2/Dockerfile
deleted file mode 100644
index 6d098fe..0000000
--- a/2.4.2/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM alpine:3.3
-
-ENV ICECAST_VERSION 2.4.2
-
-RUN \
-	apk --update add build-base openssl libvorbis opus libogg speex libtheora curl &&\
-	curl http://downloads.xiph.org/releases/icecast/icecast-${ICECAST_VERSION}.tar.gz |\
-		tar xz -C /tmp &&\
-	cd /tmp/icecast-${ICECAST_VERSION} &&\
-	./configure --enable-static &&\
-	make &&\
-	make install &&\
-	apk del build-base &&\
-	cd $HOME &&\
-	rm -rf /tmp/* /var/cache/apk/* &&\
-	addgroup -g 9999 icecast &&\
-	adduser -S -D -H -u 9999 -G 9999 -s /bin/false icecast &&\
-
-USER 9999
-VOLUME [ "/data" ]
-CMD [ "/usr/local/bin/icecast", "-c", "/data/icecast.xml" ]
-EXPOSE 8000
diff --git a/2.5 b/2.5
deleted file mode 120000
index 966a55d..0000000
--- a/2.5
+++ /dev/null
@@ -1 +0,0 @@
-2.5-beta1/
\ No newline at end of file
diff --git a/2.5-beta1/Dockerfile b/2.5-beta1/Dockerfile
deleted file mode 100644
index 93b9529..0000000
--- a/2.5-beta1/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM alpine:3.3
-
-ENV ICECAST_VERSION 2.5-beta1
-
-RUN \
-	apk --update add build-base openssl libvorbis opus libogg speex libtheora curl &&\
-	curl http://downloads.xiph.org/releases/icecast/icecast-${ICECAST_VERSION}.tar.gz |\
-		tar xz -C /tmp &&\
-	cd /tmp/icecast-${ICECAST_VERSION} &&\
-	./configure --enable-static &&\
-	make &&\
-	make install &&\
-	apk del build-base &&\
-	cd $HOME &&\
-	rm -rf /tmp/* /var/cache/apk/* &&\
-	addgroup -g 9999 icecast &&\
-	adduser -S -D -H -u 9999 -G 9999 -s /bin/false icecast &&\
-
-USER 9999
-VOLUME [ "/data" ]
-CMD [ "/usr/local/bin/icecast", "-c", "/data/icecast.xml" ]
-EXPOSE 8000
diff --git a/2.4.3/Dockerfile b/Dockerfile
similarity index 53%
rename from 2.4.3/Dockerfile
rename to Dockerfile
index ac712ba..52b726d 100644
--- a/2.4.3/Dockerfile
+++ b/Dockerfile
@@ -3,18 +3,21 @@ FROM alpine:3.3
 ENV ICECAST_VERSION 2.4.3
 
 RUN \
-	apk --update add build-base openssl libvorbis opus libogg speex libtheora curl &&\
+	apk --update add build-base file libssl1.0 openssl-dev libxslt libxslt-dev libvorbis \
+		libvorbis-dev opus opus-dev libogg libogg-dev speex speex-dev libtheora \
+		libtheora-dev curl curl-dev &&\
 	curl http://downloads.xiph.org/releases/icecast/icecast-${ICECAST_VERSION}.tar.gz |\
 		tar xz -C /tmp &&\
 	cd /tmp/icecast-${ICECAST_VERSION} &&\
 	./configure --enable-static &&\
 	make &&\
 	make install &&\
-	apk del build-base &&\
+	apk del build-base file openssl-dev libxslt-dev libvorbis-dev opus-dev libogg-dev \
+		speex-dev libtheora-dev curl-dev &&\
 	cd $HOME &&\
 	rm -rf /tmp/* /var/cache/apk/* &&\
 	addgroup -g 9999 icecast &&\
-	adduser -S -D -H -u 9999 -G 9999 -s /bin/false icecast &&\
+	adduser -S -D -H -u 9999 -G icecast -s /bin/false icecast
 
 USER 9999
 VOLUME [ "/data" ]
diff --git a/latest b/latest
deleted file mode 120000
index 6550da6..0000000
--- a/latest
+++ /dev/null
@@ -1 +0,0 @@
-2.4.3
\ No newline at end of file