diff --git a/.github/workflows/ng-build.yml b/.github/workflows/ng-build.yml
index 0828782..a059f01 100644
--- a/.github/workflows/ng-build.yml
+++ b/.github/workflows/ng-build.yml
@@ -37,12 +37,12 @@ jobs:
       fail-fast: false
       matrix:
         base_name: [beaker, beaker-zed]
-        major_version: [38, 39, rawhide]
+        major_version: [39, 40, rawhide]
         include:
-          - major_version: 38
+          - major_version: 39
             is_latest_version: true
             is_stable_version: true 
-          - major_version: 39
+          - major_version: 40
             is_latest_version: true
             is_stable_version: false 
           - major_version: rawhide
diff --git a/beaker/repos/00-hyprland b/beaker/repos/00-hyprland
index 0efdb78..7941966 100755
--- a/beaker/repos/00-hyprland
+++ b/beaker/repos/00-hyprland
@@ -19,9 +19,9 @@ rpm-ostree override remove xorg-x11-server-Xwayland
 # need to disable   hyprland-plugins 
 #  libdrm \
 if [[ "$(rpm -E %fedora)" != $RAWHIDE ]] ; then
-  rpm-ostree install -y hyprland
+  rpm-ostree install -y hyprland hyprland-plugins
 else
-  rpm-ostree install -y hyprland-git
+  rpm-ostree install -y hyprland-git hyprland-plugins-git
 fi
 
 rpm-ostree install -y \
@@ -32,6 +32,8 @@ rpm-ostree install -y \
   hyprpaper \
   hyprpicker \
   hyprshot  \
+  hypridle \
+  hyprlock \
   aylurs-gtk-shell \
   eww-wayland-git
 
diff --git a/beaker/repos/01-rpmfussion b/beaker/repos/01-rpmfussion
index b2b55f5..6ff58dd 100755
--- a/beaker/repos/01-rpmfussion
+++ b/beaker/repos/01-rpmfussion
@@ -11,18 +11,28 @@ rpm-ostree install \
 sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/rpmfusion-nonfree-steam.repo
 sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/rpmfusion-nonfree-nvidia-driver.repo
 
-# Install good bluetooth sound
+# Install good bluetooth sound (always)
 rpm-ostree install pipewire-codec-aptx
-# Intel
-#rpm-ostree install intel-media-driver
+
+#Intel
+if [[ "$(rpm -E %fedora)" != $FEDORA_STABLE ]] ; then
+
+  rpm-ostree override remove libva-intel-media-driver --install=intel-media-driver
+#   #  libva-intel-drivers libva-utils
+else
+  rpm-ostree install intel-media-driver
+fi
 
 #AMD
-#rpm-ostree override remove mesa-va-drivers --install mesa-va-drivers-freeworld
+rpm-ostree override remove mesa-va-drivers --install mesa-va-drivers-freeworld.x86_64
 
-# rpm-ostree override remove mesa-vdpau-drivers --install mesa-vdpau-drivers-freeworld
-# rpm-ostree install mesa-va-drivers-freeworld
 
 if [[ "$(rpm -E %fedora)" != $FEDORA_BETA   &&  "$(rpm -E %fedora)" != $RAWHIDE ]] ; then
+
+  # installing mozilla-openh264 seems to be the only way to get ffmpey to install
+
+  sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/fedora-cisco-openh264.repo
+
   rpm-ostree override remove \
     libavcodec-free \
     libavfilter-free \
@@ -31,10 +41,14 @@ if [[ "$(rpm -E %fedora)" != $FEDORA_BETA   &&  "$(rpm -E %fedora)" != $RAWHIDE
     libpostproc-free \
     libswresample-free \
     libswscale-free \
-    --install=ffmpeg \
-    --install=ffmpeg-libs \
+    --install=ffmpeg\
+    --install=ffmpeg-libs.x86_64 \
+    --install=libavcodec-freeworld \
+    --install=mozilla-openh264
 
-  # rpm-ostree install gstreamer1-plugin-libav gstreamer1-plugins-bad-free-extras gstreamer1-plugins-bad-freeworld gstreamer1-plugins-ugly gstreamer1-vaapi pipewire-codec-aptx
+  sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/fedora-cisco-openh264.repo
+
+  # rpm-ostree install gstreamer1-plugin-libav gstreamer1-plugins-bad-free-extras gstreamer1-plugins-bad-freeworld gstreamer1-plugins-ugly gstreamer1-vaapi
 fi
 
 sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/rpmfusion-free.repo
diff --git a/layers/build.sh b/layers/build.sh
index d93be64..5059877 100755
--- a/layers/build.sh
+++ b/layers/build.sh
@@ -2,8 +2,9 @@
 
 set -ouex pipefail
 
-export FEDORA_BETA=39
-export RAWHIDE=40
+export FEDORA_STABLE=39
+export FEDORA_BETA=40
+export RAWHIDE=41
 
 # Containerfile will copy:
 #   override: files of packages to remove