diff --git a/webtest/Dockerfile b/webtest/Dockerfile
index 32315ee..9be756d 100644
--- a/webtest/Dockerfile
+++ b/webtest/Dockerfile
@@ -1,10 +1,12 @@
 FROM debian:latest
+MAINTAINER "dragonchaser <crichter@suse.de>"
 RUN apt-get update \
-	&& apt-get install -y ruby
-EXPOSE 80
-RUN mkdir /web
-RUN chmod 0777 /web
-WORKDIR /web
+	&& apt-get install -y ruby \
+  && rm -rf /var/lib/apt/lists/* \
+  && mkdir /web \
+  && chmod 0777 /web
 COPY ./entrypoint.sh /bin
 COPY ./index.html /web
+WORKDIR /web
+EXPOSE 80
 ENTRYPOINT entrypoint.sh
diff --git a/webtest/Dockerfile.arm32v7 b/webtest/Dockerfile.arm32v7
index cd59b5d..aa2e6b9 100644
--- a/webtest/Dockerfile.arm32v7
+++ b/webtest/Dockerfile.arm32v7
@@ -2,11 +2,12 @@ FROM arm32v7/debian:buster-slim
 COPY qemu-arm-static /usr/bin
 MAINTAINER "dragonchaser <crichter@suse.de>"
 RUN apt-get update \
-	&& apt-get install -y ruby
-EXPOSE 80
-RUN mkdir /web
-RUN chmod 0777 /web
-WORKDIR /web
+	&& apt-get install -y ruby \
+  && rm -rf /var/lib/apt/lists/* \
+  && mkdir /web \
+  && chmod 0777 /web
 COPY ./entrypoint.sh /bin
 COPY ./index.html /web
+WORKDIR /web
+EXPOSE 80
 ENTRYPOINT entrypoint.sh