diff --git a/openwrt-builder-entry.sh b/openwrt-builder-entry.sh
new file mode 100755
index 0000000..9e12d46
--- /dev/null
+++ b/openwrt-builder-entry.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+[ -x /input.sh ] && /input.sh
+
+cd /builder/openwrt && /usr/bin/screen "$@"
+
+[ -x /output.sh ] && /output.sh
diff --git a/openwrt-builder.dockerfile b/openwrt-builder.dockerfile
index b85cba9..4c22284 100644
--- a/openwrt-builder.dockerfile
+++ b/openwrt-builder.dockerfile
@@ -2,8 +2,14 @@ FROM builder
 
 USER buildbot
 
-WORKDIR /builder/openwrt
+WORKDIR /builder
 
-RUN git clone https://git.laboratoryb.org/hurricos/openwrt-mirror --branch master .
+RUN git clone https://git.laboratoryb.org/hurricos/openwrt-mirror --branch master openwrt
 
+ENV openwrt_dir=/builder/openwrt
 
+RUN cd ${openwrt_dir} && ./scripts/feeds update -a && ./scripts/feeds install -a
+
+COPY openwrt-builder-entry.sh /openwrt-builder-entry.sh
+
+ENTRYPOINT [ "/openwrt-builder-entry.sh" ]