diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 47f6808c732..c5ae4b2824e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,7 +24,7 @@ jobs:
       matrix:
         image_flavor: [main, nvidia]
         base_name: [bluefin, bluefin-dx, bluefin-framework, bluefin-dx-framework]
-        major_version: [37, 38]
+        major_version: [38]
         exclude:
           - base_name: bluefin-dx-framework
             image_flavor: nvidia
@@ -37,9 +37,6 @@ jobs:
           - base_name: bluefin-dx-framework
             target_base: bluefin-dx
             target_name: framework
-          - major_version: 37
-            is_latest_version: false
-            is_stable_version: false
           - major_version: 38
             is_latest_version: true
             is_stable_version: true
diff --git a/Containerfile b/Containerfile
index de90ae29176..682fbc8e6a3 100644
--- a/Containerfile
+++ b/Containerfile
@@ -17,8 +17,8 @@ COPY --from=docker.io/bketelsen/vanilla-os:v0.0.12 /usr/share/backgrounds/vanill
 COPY --from=docker.io/bketelsen/vanilla-os:v0.0.12 /usr/share/gnome-background-properties/vanilla.xml /usr/share/gnome-background-properties/vanilla.xml
 
 
-#RUN wget https://copr.fedorainfracloud.org/coprs/kylegospo/gnome-vrr/repo/fedora-"${FEDORA_MAJOR_VERSION}"/kylegospo-gnome-vrr-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/_copr_kylegospo-gnome-vrr.repo
-#RUN rpm-ostree override replace --experimental --from repo=copr:copr.fedorainfracloud.org:kylegospo:gnome-vrr mutter gnome-control-center gnome-control-center-filesystem
+RUN wget https://copr.fedorainfracloud.org/coprs/kylegospo/gnome-vrr/repo/fedora-"${FEDORA_MAJOR_VERSION}"/kylegospo-gnome-vrr-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/_copr_kylegospo-gnome-vrr.repo
+RUN rpm-ostree override replace --experimental --from repo=copr:copr.fedorainfracloud.org:kylegospo:gnome-vrr mutter gnome-control-center gnome-control-center-filesystem xorg-x11-server-Xwayland
 
 ADD packages.json /tmp/packages.json
 ADD build.sh /tmp/build.sh
diff --git a/etc/environment b/etc/environment
new file mode 100644
index 00000000000..d0fb8abfcb6
--- /dev/null
+++ b/etc/environment
@@ -0,0 +1 @@
+MUTTER_DEBUG_FORCE_KMS_MODE=simple