diff --git a/build.sh b/build.sh
index 858b4b3..e608188 100755
--- a/build.sh
+++ b/build.sh
@@ -3,6 +3,15 @@
 echo $CONTAINER_TOKEN | docker login git.halis.io -u $GITHUB_ACTOR --password-stdin
 IMAGE_NAME=$(echo $GITHUB_SERVER_URL/$GITHUB_REPOSITORY | tr '[:upper:]' '[:lower:]' | cut -d '/' -f3-)
 
-docker pull ubuntu:latest
-docker tag ubuntu:latest $IMAGE_NAME:shell-auto-build
-docker push $IMAGE_NAME:shell-auto-build
+for d in ./images/*
+do
+    echo "Loading $d"
+    for i in $d/*
+    do
+        echo "Building $i"
+        DISTRO=$(echo $i | cut -d '/' -f 3)
+
+        docker build -f $i . -t $IMAGE_NAME:$DISTRO
+        docker push $IMAGE_NAME:$DISTRO
+    done
+done