diff --git a/Dockerfile b/Dockerfile
index 475dfca..96e36aa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,27 +7,28 @@ ENV KERNEL=${KERNEL}
 # Get list of kernels from my repo. If the list has been updated, then the image will be rebuilt. If it hasn't been updated, then caching of the previous build will be used.
 ADD "https://copr.fedorainfracloud.org/api_3/build/list?ownername=andersrh&projectname=my-ostree-os&packagename=kernel-cachyos-lto-skylake" /tmp/builds.txt
 
-RUN dnf upgrade -y
-
-RUN dnf copr enable -y andersrh/my-ostree-os
-
-RUN dnf install --nogpgcheck -y https://mirrors.rpmfusion.org/free/el/rpmfusion-free-release-$(rpm -E %rhel).noarch.rpm https://mirrors.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-$(rpm -E %rhel).noarch.rpm
-
-RUN dnf config-manager --add-repo=https://negativo17.org/repos/epel-nvidia.repo -y 
-
-RUN dnf install -y fish distrobox nvtop gwenview intel-media-driver libva-intel-driver
-RUN dnf install -y https://github.com/TheAssassin/AppImageLauncher/releases/download/v2.2.0/appimagelauncher-2.2.0-travis995.0f91801.x86_64.rpm
-
 RUN echo 'omit_drivers+=" nouveau "' | tee /etc/dracut.conf.d/blacklist-nouveau.conf
 
+COPY repo/*.repo /etc/yum.repos.d/
+RUN dnf config-manager --add-repo=https://negativo17.org/repos/epel-nvidia.repo -y
+
 RUN dnf install -y ${KERNEL} ${KERNEL}-devel-matched
 
 RUN dnf remove -y kernel kernel-core kernel-modules kernel-modules-core kernel-modules-extra kernel-tools kernel-tools-libs
 
+RUN dnf upgrade -y
+
+RUN dnf install --nogpgcheck -y https://mirrors.rpmfusion.org/free/el/rpmfusion-free-release-$(rpm -E %rhel).noarch.rpm https://mirrors.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-$(rpm -E %rhel).noarch.rpm
+
+RUN dnf install -y fish distrobox nvtop gwenview intel-media-driver libva-intel-driver
+RUN dnf install -y https://github.com/TheAssassin/AppImageLauncher/releases/download/v2.2.0/appimagelauncher-2.2.0-travis995.0f91801.x86_64.rpm
+
 # Install Negativo17 Nvidia driver
 RUN dnf install -y dkms-nvidia nvidia-driver nvidia-persistenced opencl-filesystem libva-nvidia-driver
 RUN sed -i -e 's/kernel-open$/kernel/g' /etc/nvidia/kernel.conf
 RUN dkms install nvidia/$(ls /usr/src/ | grep nvidia- | cut -d- -f2-) -k $(rpm -q --queryformat "%{VERSION}-%{RELEASE}.%{ARCH}\n" ${KERNEL})
 
+RUN dnf install -y waydroid
+
 RUN rm -rf /tmp/* /var/* && mkdir -p /var/tmp && chmod -R 1777 /var/tmp && \
 bootc container lint
diff --git a/repo/andersrh-my-ostree-os.repo b/repo/andersrh-my-ostree-os.repo
index be818c4..3305e37 100644
--- a/repo/andersrh-my-ostree-os.repo
+++ b/repo/andersrh-my-ostree-os.repo
@@ -1,6 +1,6 @@
-[copr:copr.fedorainfracloud.org:andersrh:my-ostree-os]
+[my-ostree-os-epel]
 name=Copr repo for my-ostree-os owned by andersrh
-baseurl=https://download.copr.fedorainfracloud.org/results/andersrh/my-ostree-os/fedora-$releasever-$basearch/
+baseurl=https://download.copr.fedorainfracloud.org/results/andersrh/my-ostree-os/epel-10-$basearch/
 type=rpm-md
 skip_if_unavailable=True
 gpgcheck=1
@@ -8,15 +8,3 @@ gpgkey=https://download.copr.fedorainfracloud.org/results/andersrh/my-ostree-os/
 repo_gpgcheck=0
 enabled=1
 enabled_metadata=1
-
-[copr:copr.fedorainfracloud.org:andersrh:my-ostree-os:ml]
-name=Copr repo for my-ostree-os owned by andersrh (i386)
-baseurl=https://download.copr.fedorainfracloud.org/results/andersrh/my-ostree-os/fedora-$releasever-i386/
-type=rpm-md
-skip_if_unavailable=True
-gpgcheck=1
-gpgkey=https://download.copr.fedorainfracloud.org/results/andersrh/my-ostree-os/pubkey.gpg
-repo_gpgcheck=0
-cost=1100
-enabled=1
-enabled_metadata=1
diff --git a/repo/andersrh-myostree-os-rhel+epel.repo b/repo/andersrh-myostree-os-rhel+epel.repo
new file mode 100644
index 0000000..0c5b27a
--- /dev/null
+++ b/repo/andersrh-myostree-os-rhel+epel.repo
@@ -0,0 +1,11 @@
+[my-ostree-os-rhel-epel]
+name=Copr repo for my-ostree-os owned by andersrh for RHEL+EPEL
+baseurl=https://download.copr.fedorainfracloud.org/results/andersrh/my-ostree-os/rhel+epel-10-$basearch/
+type=rpm-md
+skip_if_unavailable=True
+gpgcheck=1
+gpgkey=https://download.copr.fedorainfracloud.org/results/andersrh/my-ostree-os/pubkey.gpg
+repo_gpgcheck=0
+enabled=1
+enabled_metadata=1
+priority=98
diff --git a/repo/jhyub-supergfxctl-plasmoid.repo b/repo/jhyub-supergfxctl-plasmoid.repo
deleted file mode 100644
index 9da555b..0000000
--- a/repo/jhyub-supergfxctl-plasmoid.repo
+++ /dev/null
@@ -1,10 +0,0 @@
-[copr:copr.fedorainfracloud.org:jhyub:supergfxctl-plasmoid]
-name=Copr repo for supergfxctl-plasmoid owned by jhyub
-baseurl=https://download.copr.fedorainfracloud.org/results/jhyub/supergfxctl-plasmoid/fedora-$releasever-$basearch/
-type=rpm-md
-skip_if_unavailable=True
-gpgcheck=1
-gpgkey=https://download.copr.fedorainfracloud.org/results/jhyub/supergfxctl-plasmoid/pubkey.gpg
-repo_gpgcheck=0
-enabled=1
-enabled_metadata=1
diff --git a/repo/lukenukem-asus-linux.repo b/repo/lukenukem-asus-linux.repo
deleted file mode 100644
index c28cc06..0000000
--- a/repo/lukenukem-asus-linux.repo
+++ /dev/null
@@ -1,10 +0,0 @@
-[copr:copr.fedorainfracloud.org:lukenukem:asus-linux]
-name=Copr repo for asus-linux owned by lukenukem
-baseurl=https://download.copr.fedorainfracloud.org/results/lukenukem/asus-linux/fedora-$releasever-$basearch/
-type=rpm-md
-skip_if_unavailable=True
-gpgcheck=1
-gpgkey=https://download.copr.fedorainfracloud.org/results/lukenukem/asus-linux/pubkey.gpg
-repo_gpgcheck=0
-enabled=1
-enabled_metadata=1