diff --git a/tools-image/Dockerfile b/tools-image/Dockerfile
index 1ffc12d..cac5955 100644
--- a/tools-image/Dockerfile
+++ b/tools-image/Dockerfile
@@ -1,13 +1,13 @@
 # https://quay.io/repository/kairos/packages?tab=tags&tag=latest
-ARG ELEMENTAL_CLI_VERSION=0.20221121.1
 ARG LEAP_VERSION=15.4
 ARG LUET_VERSION=0.33.0
-FROM quay.io/kairos/packages:elemental-cli-system-$ELEMENTAL_CLI_VERSION AS elemental
 FROM quay.io/luet/base:$LUET_VERSION AS luet
 
-### TODO: Replace those naked Dockerfiles copies with luet install so we can keep track of all versioning with 1 repository tag
-### 1) Add the kairos repository with a reference
-### 2) populate folders accordingly
+FROM opensuse/leap:$LEAP_VERSION as elemental-install
+COPY --from=luet /usr/bin/luet /usr/bin/luet
+ENV LUET_NOLOCK=true
+COPY luet.yaml /etc/luet/luet.yaml
+RUN luet install -y system/elemental-cli
 
 ## amd64 Live CD artifacts
 FROM quay.io/kairos/packages:grub2-livecd-0.0.6 AS grub2
@@ -35,7 +35,7 @@ FROM quay.io/kairos/packages:grub-config-static-0.1  AS grub-raw-config
 FROM quay.io/kairos/packages:grub-artifacts-static-0.1   AS grub-raw-artifacts
 
 FROM opensuse/leap:$LEAP_VERSION
-COPY --from=elemental /usr/bin/elemental /usr/bin/elemental
+COPY --from=elemental-install /usr/bin/elemental /usr/bin/elemental
 COPY --from=luet /usr/bin/luet /usr/bin/luet
 
 # x86_64 ISOs
diff --git a/tools-image/luet.yaml b/tools-image/luet.yaml
new file mode 100644
index 0000000..a7bba7a
--- /dev/null
+++ b/tools-image/luet.yaml
@@ -0,0 +1,23 @@
+general:
+  debug: false
+  enable_emoji: true
+  spinner_charset: 9
+repositories:
+  - name: "kairos"
+    description: "kairos repository"
+    type: "docker"
+    arch: amd64
+    cached: true
+    priority: 2
+    urls:
+      - "quay.io/kairos/packages"
+    reference: 20230324073123-repository.yaml
+  - name: "kairos-arm64"
+    description: "kairos repository arm64"
+    type: "docker"
+    arch: arm64
+    cached: true
+    priority: 2
+    urls:
+      - "quay.io/kairos/packages-arm64"
+    reference: 20230324075000-repository.yaml
\ No newline at end of file