diff --git a/Containerfile b/Containerfile
index 62b39ba..318f7ab 100644
--- a/Containerfile
+++ b/Containerfile
@@ -1,19 +1,32 @@
 FROM quay.io/fedora/fedora-bootc:41
 
 #include unit files and containers
-ADD etc etc
+ADD system_files/shared/etc etc
 #ADD usr usr
 
 #add additional software
 #RUN dnf install -y cockpit cockpit-podman cockpit-storaged cockpit-ws git lm_sensors sysstat tuned vim-enhanced bash-completion && dnf clean all
-RUN dnf group install -y swaywm && \
-    dnf install -y go && \
+RUN <<EOF
+    set -ouex pipefail
+
+    dnf config-manager --save \
+    --setopt=exclude=PackageKit,PackageKit-command-not-found,rootfiles,firefox
+
+    dnf install --assumeyes @"Sway Desktop"
+
+    dnf install --assumeyes go
+
     dnf clean all
 
+    QUALIFIED_KERNEL="$(rpm --query --all | grep --perl-regexp 'kernel-(\d+\.\d+\.\d+)' | sed --regexp-extended 's/kernel-//')"
+    dracut --no-hostonly --kver "$QUALIFIED_KERNEL" --reproducible --verbose --add ostree --force "/lib/modules/$QUALIFIED_KERNEL/initramfs.img"
+
+EOF
+
 #enable desired units
 #RUN systemctl enable lm_sensors sysstat tuned fstrim.timer podman.socket podman-auto-update.timer cockpit.socket
 
-RUN rm -rf /tmp/* /var/* && \
-    mkdir -p /var/tmp && chmod -R 1777 /var/tmp && \
+RUN rm --force --recursive /tmp/* /var/* && \
+    mkdir --parents /var/tmp && chmod --recursive 1777 /var/tmp && \
     ostree container commit && \
-    bootc container lint || true
\ No newline at end of file
+    bootc container lint || true
diff --git a/etc/sudoers.d/wheel-nopasswd b/system_files/shared/etc/sudoers.d/wheel-nopasswd
similarity index 100%
rename from etc/sudoers.d/wheel-nopasswd
rename to system_files/shared/etc/sudoers.d/wheel-nopasswd