diff --git a/Dockerfile b/Dockerfile
index 125f7a6d..613a2e4b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,9 @@
 FROM ubuntu:22.04
 LABEL maintainer "Pawel Wodnicki <pawel@32bitmicro.com>"
+LABEL org.opencontainers.image.source=https://github.com/32bitmicro/LLVM-Embedded-Toolchain
+LABEL org.opencontainers.image.description="LLVM Embedded Toolchain LLVM-ETOOOL image"
+LABEL org.opencontainers.image.licenses=Apache
+
 
 RUN apt-get -o Acquire::ForceIPv4=true update && apt-get -o Acquire::ForceIPv4=true install -y \
     build-essential \
@@ -7,15 +11,6 @@ RUN apt-get -o Acquire::ForceIPv4=true update && apt-get -o Acquire::ForceIPv4=t
     cmake \
     ninja-build \
     make \
-    llvm llvm-dev \
-    clang clang-tools \
-    lldb \
-    lld \
-    libc++-dev libc++abi-dev \
     python3-minimal python3-pip\
     wget \
     software-properties-common
-
-ADD build-from-public-repos.sh  /tmp
-WORKDIR /tmp
-RUN /tmp/build-from-public-repos.sh