diff --git a/Dockerfile b/Dockerfile
index 1048e3a24423c9dfae9c30b8fa1727a7b10dbc8b..aca886d585d60c2f12fe01e78f2445efdaa1a69a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,16 +1,9 @@
-ARG SDK_VERSION
+ARG SDK_VERSION=30.0.3
 FROM k8r.eu/justjanne/android-sdk:$SDK_VERSION
-
 RUN apt-get --quiet update --yes && \
-    apt-get --quiet install --yes python3 python3-lxml podman
+    apt-get --quiet install --yes python3 python3-lxml
+
+ENV PATH=$PATH:$ANDROID_HOME/platform-tools/
+ENV ANDROID_HOME=$PWD/android-sdk-linux
+ENV GRADLE_OPTS="-Dorg.gradle.daemon=False"
 
-ARG UID=1000
-ARG GID=1000
-RUN mkdir /build && \
-    chown $UID:$GID /build && \
-    groupadd --gid ${GID} build && \
-    useradd --uid ${UID} --gid ${GID} --home /build build
-WORKDIR /build
-RUN podman system service -t 0 tcp:localhost:8880 &
-ENV DOCKER_HOST=tcp://localhost:8880
-ENV TESTCONTAINERS_RYUK_DISABLED=true