diff --git a/.gitignore b/.gitignore
index 56d20870cedf018557a01bf147126aa02bbfc7b2..57f1cb2a7a1855e09f3a4d4bbb900ebfc4b23621 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/build.sh
-/deploy.sh
+/.idea/
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 24bf86bf2baa4d17b1c826f3eb54ae3c066d9236..4e6ccbfda6b4f740727a58e4cdbd12683ebc7d01 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,42 +1,23 @@
-ARG BUILD_TOOLS=34.0.0
-
-FROM openjdk:8-jdk as builder
-ARG BUILD_TOOLS
-
-RUN apt-get --quiet update --yes && \
-    apt-get --quiet install --yes wget tar unzip lib32stdc++6 lib32z1
-RUN wget --quiet --output-document=android-sdk.zip https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip && \
-    unzip -q android-sdk.zip -d android-sdk-linux && \
-    rm android-sdk.zip
-RUN mkdir android-sdk-linux/licenses && \
-    printf "8933bad161af4178b1185d1a37fbf41ea5269c55\nd56f5187479451eabf01fb78af6dfcb131a6481e\n24333f8a63b6825ea9c5514f83c2829b004d1fee" > android-sdk-linux/licenses/android-sdk-license && \
-    printf "84831b9409646a918e30573bab4c9c91346d8abd" > android-sdk-linux/licenses/android-sdk-preview-license
-RUN android-sdk-linux/tools/bin/sdkmanager --update > /dev/null
-RUN android-sdk-linux/tools/bin/sdkmanager \
-      "build-tools;${BUILD_TOOLS}" \
-      > /dev/null
-
-RUN ls android-sdk-linux/build-tools/34.0.0/
-
 FROM ubuntu:latest
-ARG BUILD_TOOLS
 
 ENV TZ=Etc/UTC
 ENV DEBIAN_FRONTEND=noninteractive
 
-RUN apt-get update && apt-get -y install --no-install-recommends \
-    default-jdk-headless git python3-pip python3-wheel python3-setuptools python3-venv tzdata && \
-    apt-get install -y --no-install-recommends $(apt-cache depends fdroidserver | grep -Fv -e java -e jdk -e '<' | awk '/Depends:/{print$2}') && \
-    rm -rf /var/lib/apt/lists/*
+RUN apt-get update \
+    && apt-get -y install --no-install-recommends \
+      default-jdk-headless google-android-build-tools-34.0.0-installer \
+      git tzdata \
+      python3-pip python3-wheel python3-setuptools python3-venv \
+    && apt-get install -y --no-install-recommends $(apt-cache depends fdroidserver | grep -Fv -e java -e jdk -e '<' | awk '/Depends:/{print$2}') \
+    && rm -rf /var/lib/apt/lists/* \
+    && apt-get clean
 
 RUN git clone --depth 1 https://gitlab.com/fdroid/fdroidserver.git \
     && cd fdroidserver \
-    && pip3 install --no-binary python-vagrant -e . \
+    && pip3 install --break-system-packages --no-binary python-vagrant -e . \
     && python3 setup.py compile_catalog build \
     && python3 setup.py install
 
-COPY --from=builder /android-sdk-linux/build-tools/${BUILD_TOOLS} /opt/android-sdk
-
 ADD src/update_repo.sh /
 
 ENTRYPOINT [ "/update_repo.sh" ]