diff --git a/Dockerfile b/Dockerfile
index 28f465b6..c4e9fddc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,23 +1,11 @@
 # Use ROS builder image just to get the build tools in place
 FROM ghcr.io/tiiuae/fog-ros-baseimage-builder:feat-multiarch-pkcs11 AS builder
-# Use ROS builder image just to get the build tools in place
-FROM ghcr.io/tiiuae/fog-ros-baseimage-builder:feat-multiarch-pkcs11 AS builder
-
-# Setup timezone
-RUN ln -s -f /usr/share/zoneinfo/Etc/UTC /etc/localtime
 
-#RUN apt-get update && apt-get install -y --no-install-recommends \
-#    python3-future python3-lxml git python3-pip \
-#    build-essential libtool autoconf cmake \
-#    pkg-config gcc g++ autotools-dev automake \
-#    && rm -rf /var/lib/apt/lists/*
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    meson ninja \
+RUN apt update \
+    && apt install -y --no-install-recommends \
+        meson ninja \
     && rm -rf /var/lib/apt/lists/*
 
-#RUN pip3 install ninja meson
-
 WORKDIR /build
 
 COPY . .
@@ -34,15 +22,9 @@ ENTRYPOINT ["/usr/bin/mavlink-routerd"]
 CMD ["-c", "/etc/mavlink-router/main.conf"]
 
 RUN mkdir -p /etc/mavlink-router
-COPY conf /etc/mavlink-router
 
-# Setup timezone
-RUN echo 'Etc/UTC' > /etc/timezone \
-    && ln -s /usr/share/zoneinfo/Etc/UTC /etc/localtime \
-    && apt-get update && apt-get install -q -y tzdata \
-    && rm -rf /var/lib/apt/lists/*
+COPY conf /etc/mavlink-router
 
 WORKDIR /fog-drone
 
 COPY --from=builder /build/build/src/mavlink-routerd /usr/bin
-