diff --git a/bootc/Containerfile b/bootc/Containerfile
index b6367ac..9af1779 100644
--- a/bootc/Containerfile
+++ b/bootc/Containerfile
@@ -5,7 +5,7 @@ ARG ADMIN_USERNAME=demo \
     NVIDIA_KERNEL_VERSION=5.14.0-427.22.1.el9_4
 
 RUN set -Eeuo pipefail ; \
-    if ! grep -qxF 'keepcache=1'; then \
+    if ! grep -qxF 'keepcache=1' /etc/dnf/dnf.conf; then \
       sed -i.bak '/^\[main\]$/a keepcache=1' /etc/dnf/dnf.conf ; \
     fi ; \
     echo "Replacing current kernel with a version compatible with the kernel modules shipped by Nvidia" ; \
@@ -28,5 +28,4 @@ RUN set -Eeuo pipefail ; \
 ADD --chown=root:root root /
 
 RUN set -Eeuo pipefail ; \
-    systemctl enable nvidia-ctk-init.service ; \
-    systemctl enable repo-intelligent-train.service
+    systemctl enable nvidia-ctk-init.service
diff --git a/bootc/root/etc/containers/systemd/intelligent-train.container b/bootc/root/etc/containers/systemd/app-edge-ai.container
similarity index 67%
rename from bootc/root/etc/containers/systemd/intelligent-train.container
rename to bootc/root/etc/containers/systemd/app-edge-ai.container
index ec97c67..d174178 100644
--- a/bootc/root/etc/containers/systemd/intelligent-train.container
+++ b/bootc/root/etc/containers/systemd/app-edge-ai.container
@@ -1,16 +1,14 @@
 [Unit]
-Description=AI Auto-Pilot
+Description=AI application deployed at the Edge
 After=local-fs.target
 
 [Service]
 ExecStartPre=-podman network create --ignore app
 
 [Container]
-ContainerName=intelligent-train
-Image=quay.io/demo-ai-edge-crazy-train/intelligent-train:latest
+ContainerName=app-edge-ai
+Image=quay.io/nmasse-redhat/app-edge-ai:latest
 Network=app
-PublishPort=8080:8080
-EnvironmentFile=/etc/intelligent-train.env
 
 # Needed for Nvidia GPU Acceleration
 PodmanArgs=--runtime /usr/bin/nvidia-container-runtime
diff --git a/bootc/root/etc/containers/systemd/mosquitto.container b/bootc/root/etc/containers/systemd/mosquitto.container
deleted file mode 100644
index 34eb550..0000000
--- a/bootc/root/etc/containers/systemd/mosquitto.container
+++ /dev/null
@@ -1,20 +0,0 @@
-[Unit]
-Description=Mosquitto MQTT Broker
-After=local-fs.target
-
-[Service]
-ExecStartPre=-podman network create --ignore app
-
-[Container]
-ContainerName=mosquitto
-Image=docker.io/library/eclipse-mosquitto:latest
-Network=app
-PublishPort=1883:1883
-PublishPort=9001:9001
-Volume=/var/lib/mosquitto/data:/mosquitto/data:z
-Volume=/var/lib/mosquitto/log:/mosquitto/log:z
-Volume=/etc/mosquitto:/mosquitto/config:z
-
-[Install]
-# Start by default on boot
-WantedBy=multi-user.target default.target
diff --git a/bootc/root/etc/intelligent-train.env b/bootc/root/etc/intelligent-train.env
deleted file mode 100644
index 25a1d67..0000000
--- a/bootc/root/etc/intelligent-train.env
+++ /dev/null
@@ -1,6 +0,0 @@
-MQTT_BROKER=mosquitto
-MQTT_PORT=1883
-MQTT_TOPIC=train-image
-MQTT_PUB_TOPIC=train-model-result
-MODEL_PATH=models/model.onnx
-MIN_CONF_THRESHOLD=0.7
diff --git a/bootc/root/etc/mosquitto/mosquitto.conf b/bootc/root/etc/mosquitto/mosquitto.conf
deleted file mode 100644
index 1a0864c..0000000
--- a/bootc/root/etc/mosquitto/mosquitto.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-user mosquitto
-persistence true
-persistence_location /mosquitto/data/
-listener 1883 0.0.0.0
-protocol mqtt
-allow_anonymous true
-log_dest file /mosquitto/log/mosquitto.log
diff --git a/bootc/root/etc/systemd/system/repo-intelligent-train.service b/bootc/root/etc/systemd/system/repo-intelligent-train.service
deleted file mode 100644
index f6bfe25..0000000
--- a/bootc/root/etc/systemd/system/repo-intelligent-train.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Sync the intelligent-train git repo
-Wants=network-online.target
-After=network-online.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/bin/sh -c 'if [ -d /root/intelligent-train ]; then cd /root/intelligent-train && git pull ; else git clone -b main https://github.com/Demo-AI-Edge-Crazy-Train/intelligent-train.git /root/intelligent-train ; fi'
-
-[Install]
-WantedBy=multi-user.target