diff --git a/repo/Dockerfile b/repo/Dockerfile
index 606b596..a326146 100644
--- a/repo/Dockerfile
+++ b/repo/Dockerfile
@@ -2,10 +2,9 @@ FROM debian:buster-slim
 
 RUN apt-get update && apt-get install -y unzip autoconf build-essential libssl-dev pkg-config zlib1g-dev libargon2-dev libsodium-dev libcurl4-openssl-dev sqlite3 libsqlite3-dev libonig-dev libxml2 libxml2-dev bc curl git linux-headers-amd64 perl xz-utils python3 python3-pip gnupg jq zlib1g-dev cmake cmake-doc extra-cmake-modules build-essential gcc binutils bash coreutils util-linux pciutils usbutils coreutils binutils findutils grep && \
         ln -sf /bin/bash /bin/sh && \
-        pip3 install 'yq==2.12.0' && \
         rm -rf /var/lib/apt/lists/*
 
 ADD *.sh /
 
 ENTRYPOINT ["bash","/entrypoint.sh"]
-CMD ["all"]
+CMD ["--no-build"]
diff --git a/repo/entrypoint.sh b/repo/entrypoint.sh
index dfe0889..5b7c20e 100755
--- a/repo/entrypoint.sh
+++ b/repo/entrypoint.sh
@@ -1,14 +1,38 @@
 cd /piston/packages
 
 SERVER=1
+BUILD=1
+
+echo "Running through arguments.."
 
 for pkg in "$@"
 do
-    [[ "$pkg" = "--no-server" ]] && SERVER=0 || make -j16 $pkg.pkg.tar.gz
+    if [[ "$pkg" = "--no-server" ]]; then
+        echo "Not starting index server after builds"
+        SERVER=0
+    elif [[ "$pkg" = "--no-build" ]]; then
+        echo "Building no more package"
+        BUILD=0
+    else
+        if [[ $BUILD -eq 1 ]]; then
+            echo "Building package $pkg"
+            make -j16 $pkg.pkg.tar.gz
+            echo "Done with package $pkg"
+        else
+            echo "Building was disabled, skipping $pkg"
+        fi
+    fi
 done
 
 cd /piston/repo
+echo "Creating index"
 ./mkindex.sh
+echo "Index created"
 
-[[ $SERVER -eq 1 ]] && python3 -m http.server
+if [[ $SERVER -eq 1 ]]; then
+    echo "Starting index server.."
+    python3 -m http.server
+else
+    echo "Skipping starting index server"
+fi
 exit 0
\ No newline at end of file