diff --git a/Containerfile b/Containerfile
index 40d17d8b..f379786e 100644
--- a/Containerfile
+++ b/Containerfile
@@ -92,6 +92,12 @@ FROM bazzite as bazzite-deck
 ARG IMAGE_NAME="${IMAGE_NAME}"
 ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION}"
 
+COPY system_files/deck/etc /etc
+COPY system_files/deck/usr /usr
+RUN ln -s /usr/bin/steamos-logger /usr/bin/steamos-info && \
+    ln -s /usr/bin/steamos-logger /usr/bin/steamos-notice && \
+    ln -s /usr/bin/steamos-logger /usr/bin/steamos-warning
+
 # Add LatencyFleX Copr
 RUN wget https://copr.fedorainfracloud.org/coprs/kylegospo/LatencyFleX/repo/fedora-$(rpm -E %fedora)/kylegospo-LatencyFleX-fedora-$(rpm -E %fedora).repo -O \
     /etc/yum.repos.d/_copr_kylegospo-latencyflex.repo
@@ -113,12 +119,6 @@ RUN rpm-ostree override remove steamdeck-kde-themes
 # Remove ublue-os-wallpapers
 RUN rpm-ostree override remove ublue-os-wallpapers
 
-COPY system_files/deck/etc /etc
-COPY system_files/deck/usr /usr
-RUN ln -s /usr/bin/steamos-logger /usr/bin/steamos-info && \
-    ln -s /usr/bin/steamos-logger /usr/bin/steamos-notice && \
-    ln -s /usr/bin/steamos-logger /usr/bin/steamos-warning
-
 # Install patched udisks2 (Needed for SteamOS SD card mounting)
 RUN rpm-ostree override replace --experimental --from repo=copr:copr.fedorainfracloud.org:kylegospo:bazzite udisks2
 
diff --git a/spec_files/jupiter-fan-control/jupiter-fan-control.spec b/spec_files/jupiter-fan-control/jupiter-fan-control.spec
index 1c6d561d..c5ad03d6 100644
--- a/spec_files/jupiter-fan-control/jupiter-fan-control.spec
+++ b/spec_files/jupiter-fan-control/jupiter-fan-control.spec
@@ -2,7 +2,7 @@ Name:           jupiter-fan-control
 Version:        {{{ git_dir_version }}}
 Release:        1%{?dist}
 Summary:        Steam Deck Fan Controller
-License:    	MIT
+License:        MIT
 URL:            https://github.com/ublue-os/bazzite
 
 Source:         https://gitlab.com/evlaV/%{name}/-/archive/main/%{name}-main.tar.gz
@@ -10,7 +10,7 @@ BuildArch:      noarch
 
 Patch0:         fedora.patch
 
-Requires:		python3
+Requires:       python3
 
 BuildRequires:  systemd-rpm-macros
 
diff --git a/spec_files/jupiter-hw-support/jupiter-hw-support-btrfs.spec b/spec_files/jupiter-hw-support/jupiter-hw-support-btrfs.spec
index 9a5550d0..a0b0c1a2 100644
--- a/spec_files/jupiter-hw-support/jupiter-hw-support-btrfs.spec
+++ b/spec_files/jupiter-hw-support/jupiter-hw-support-btrfs.spec
@@ -3,7 +3,7 @@ Name:           %{packagename}-btrfs
 Version:        {{{ git_dir_version }}}
 Release:        1%{?dist}
 Summary:        Steam Deck Hardware Support Package
-License:    	GPLv3
+License:        GPLv3
 URL:            https://github.com/ublue-os/bazzite
 
 Source:         https://gitlab.com/evlaV/%{packagename}/-/archive/master/%{packagename}-master.tar.gz
diff --git a/spec_files/jupiter-hw-support/jupiter-hw-support.spec b/spec_files/jupiter-hw-support/jupiter-hw-support.spec
index f5cfcb5f..6ac1c599 100644
--- a/spec_files/jupiter-hw-support/jupiter-hw-support.spec
+++ b/spec_files/jupiter-hw-support/jupiter-hw-support.spec
@@ -2,7 +2,7 @@ Name:           jupiter-hw-support
 Version:        {{{ git_dir_version }}}
 Release:        1%{?dist}
 Summary:        Steam Deck Hardware Support Package
-License:    	MIT
+License:        MIT
 URL:            https://github.com/ublue-os/bazzite
 
 Source:        	https://gitlab.com/evlaV/%{name}/-/archive/master/%{name}-master.tar.gz
diff --git a/spec_files/mesa-va-drivers/mesa-va-drivers.spec b/spec_files/mesa-va-drivers/mesa-va-drivers.spec
index c11b7050..7ea817fd 100644
--- a/spec_files/mesa-va-drivers/mesa-va-drivers.spec
+++ b/spec_files/mesa-va-drivers/mesa-va-drivers.spec
@@ -2,11 +2,11 @@ Name:           mesa-va-drivers
 Version:        1000.0.0
 Release:        1%{?dist}
 Summary:        Corrects a dependency issue between steam and mesa-va-drivers-freeworld on rpm-ostree distributions
-License:    	GPLv2
+License:        GPLv2
 URL:            https://github.com/ublue-os/bazzite
 BuildArch:      noarch
 
-Source0:         https://raw.githubusercontent.com/ublue-os/bazzite/yafti/spec_files/mesa-va-drivers-freeworld-steamfix/LICENSE
+Source0:        https://raw.githubusercontent.com/ublue-os/bazzite/main/spec_files/%{name}/LICENSE
 
 Requires:       mesa-va-drivers-freeworld
 Provides:       mesa-va-drivers = %{version}
diff --git a/spec_files/steamdeck-kde-presets/steamdeck-kde-presets.spec b/spec_files/steamdeck-kde-presets/steamdeck-kde-presets.spec
index b5700777..94c75239 100644
--- a/spec_files/steamdeck-kde-presets/steamdeck-kde-presets.spec
+++ b/spec_files/steamdeck-kde-presets/steamdeck-kde-presets.spec
@@ -2,15 +2,15 @@ Name:           steamdeck-kde-presets
 Version:        {{{ git_dir_version }}}
 Release:        1%{?dist}
 Summary:        KDE Presets from Valve's SteamOS 3.0
-License:    	GPLv2
+License:        GPLv2
 URL:            https://github.com/ublue-os/bazzite
 
 Source:         https://gitlab.com/evlaV/%{name}/-/archive/master/%{name}-master.tar.gz
 BuildArch:      noarch
 
-Requires:		kde-filesystem
+Requires:       kde-filesystem
 
-Conflicts:  	steamdeck-kde-themes
+Conflicts:      steamdeck-kde-themes
 
 %description
 KDE Presets from Valve's SteamOS 3.0
diff --git a/spec_files/steamdeck-kde-presets/steamdeck-kde-themes.spec b/spec_files/steamdeck-kde-presets/steamdeck-kde-themes.spec
index 57bdecfa..89d28c92 100644
--- a/spec_files/steamdeck-kde-presets/steamdeck-kde-themes.spec
+++ b/spec_files/steamdeck-kde-presets/steamdeck-kde-themes.spec
@@ -3,15 +3,15 @@ Name:           steamdeck-kde-themes
 Version:        {{{ git_dir_version }}}
 Release:        1%{?dist}
 Summary:        KDE Themes from Valve's SteamOS 3.0
-License:    	GPLv2
+License:        GPLv2
 URL:            https://github.com/ublue-os/bazzite
 
 Source:         https://gitlab.com/evlaV/%{packagename}/-/archive/master/%{packagename}-master.tar.gz
 BuildArch:      noarch
 
-Requires:		kde-filesystem
+Requires:       kde-filesystem
 
-Conflicts:  	steamdeck-kde-presets
+Conflicts:      steamdeck-kde-presets
 
 %description
 KDE Themes from Valve's SteamOS 3.0