diff --git a/gitiles/Dockerfile b/gitiles/Dockerfile
index 6843dbc..bb158c3 100644
--- a/gitiles/Dockerfile
+++ b/gitiles/Dockerfile
@@ -13,15 +13,21 @@ RUN apk --update add \
 
 # install buck
 RUN git clone --depth 1 https://github.com/facebook/buck.git /buck \
-	&& cd /buck \
-	&& ant \
-	&& ln -snfv ${PWD}/bin/buck /usr/bin/buck
-
-RUN git clone  --depth 1 --recurse-submodules https://gerrit.googlesource.com/gitiles /gitiles \
-	&& cd /gitiles \
-	&& touch .nobuckcheck \
-	&& git submodule update --init \
-	&& buck build all
+	&& ( \
+		cd /buck \
+		&& ant \
+		&& ln -snfv ${PWD}/bin/buck /usr/bin/buck \
+	) \
+	&& git clone  --depth 1 --recurse-submodules https://gerrit.googlesource.com/gitiles /gitiles \
+	&& ( \
+		cd /gitiles \
+		&& touch .nobuckcheck \
+		&& git submodule update --init \
+		&& buck build all \
+		&& mv buck-out/gen/gitiles/gitiles.war /gitiles.war \
+	) \
+	&& rm -rf /gitiles \
+	&& rm -rf /buck
 
 COPY ./start.sh /start.sh
 
diff --git a/gitiles/start.sh b/gitiles/start.sh
index 99854b9..34a574c 100755
--- a/gitiles/start.sh
+++ b/gitiles/start.sh
@@ -9,4 +9,4 @@ if [ "x$1" != "x" ]; then
 fi
 PROPERTIES="$PROPERTIES -Dcom.google.gitiles.sourcePath=$ROOT"
 
-exec java $PROPERTIES -jar "$ROOT/buck-out/gen/gitiles-dev/dev.jar"
+exec java $PROPERTIES -jar "$ROOT/buck-out/gen/gitiles/gitiles.war"