diff --git a/Dockerfile b/Dockerfile
index d87a351..352e370 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,10 @@
 ## https://github.com/userjack6880/Open-Report-Parser
 FROM debian:12 AS parserbuild
 
-RUN apt-get update
-RUN apt-get -y upgrade
-RUN apt-get install -y git
+RUN set -ex ; \
+    apt-get update ; \
+    apt-get -y upgrade ; \
+    apt-get install -y git
 
 WORKDIR /src
 RUN git clone https://github.com/userjack6880/Open-Report-Parser.git 
@@ -16,14 +17,14 @@ RUN git archive --format tar main | tar -x -C /opt/open-report-parser
 ## https://github.com/userjack6880/Open-DMARC-Analyzer
 
 ### We need composer
-
 FROM composer:latest AS composer
-
 FROM php:cli AS analyzerbuilder
-RUN apt-get update
-RUN apt-get -y upgrade
-RUN apt-get install -y git
-RUN mkdir -p /src/analyzer
+
+RUN set -ex ; \
+    apt-get update ; \
+    apt-get -y upgrade ; \
+    apt-get install -y git ; \
+    mkdir -p /src/analyzer
 
 COPY --from=composer /usr/bin/composer /usr/bin/composer
 
@@ -40,17 +41,17 @@ RUN /usr/bin/composer require "kevinoo/phpwhois":"^6.3"
 FROM php:8.3-apache
 
 # Install dependencies
-RUN apt-get update
-RUN apt-get -y upgrade
-
-RUN apt-get install -y libpq-dev libfile-mimeinfo-perl libmail-imapclient-perl libmime-tools-perl \
+RUN set -ex ; \
+    apt-get update ; \
+    apt-get -y upgrade ; \
+    apt-get install -y libpq-dev libfile-mimeinfo-perl libmail-imapclient-perl libmime-tools-perl \
                        libxml-simple-perl libio-socket-inet6-perl libio-socket-ip-perl libperlio-gzip-perl \ 
                        libmail-mbox-messageparser-perl libwww-perl unzip \
                        libdbd-mysql-perl libdbd-pg-perl \
                        liblwp-protocol-https-perl libencode-perl libtime-piece-mysql-perl \
-                       libjson-perl 
-
-RUN docker-php-ext-install pdo pdo_mysql pdo_pgsql
+                       libjson-perl ; \
+    docker-php-ext-install pdo pdo_mysql pdo_pgsql ; \
+    rm -rf var/lib/apt/lists/*
 
 # open-report-parser
 COPY --from=parserbuild /opt/open-report-parser /opt/open-report-parser