diff --git a/system_files/shared/usr/libexec/ublue-system-setup b/system_files/shared/usr/libexec/ublue-system-setup
index c2f25d48d64..11248a7c004 100755
--- a/system_files/shared/usr/libexec/ublue-system-setup
+++ b/system_files/shared/usr/libexec/ublue-system-setup
@@ -63,6 +63,23 @@ else
   echo "No karg changes needed"
 fi
 
+# FRAMEWORK 13 AMD FIXES
+if [[ ":Framework:" =~ ":$VEN_ID:" ]]; then
+  if [[ $SYS_ID == "Laptop ("* ]];
+    if [[ "AuthenticAMD" == "$CPU_VENDOR" ]]; then
+      if [[ ! -f /etc/modprobe.d/alsa.conf ]]; then
+        echo 'Fixing 3.5mm jack'
+        sudo tee /etc/modprobe.d/alsa.conf <<< "options snd-hda-intel index=1,0 model=auto,dell-headset-multi"
+        echo 0 | sudo tee /sys/module/snd_hda_intel/parameters/power_save
+      fi
+      if [[ ! -f /etc/udev/rules.d/20-suspend-fixes.rules ]]; then
+        echo 'Fixing suspend issue'
+        echo "ACTION==\"add\", SUBSYSTEM==\"serio\", DRIVERS==\"atkbd\", ATTR{power/wakeup}=\"disabled\"" > /etc/udev/rules.d/20-suspend-fixes.rules'
+      fi
+    fi
+  fi
+fi
+
 echo "$IMAGE_NAME" > $KNOWN_IMAGE_NAME_FILE
 echo "$IMAGE_FLAVOR" > $KNOWN_IMAGE_FLAVOR_FILE
 echo "$HWS_VER" > $HWS_VER_FILE
diff --git a/system_files/shared/usr/libexec/ublue-user-setup b/system_files/shared/usr/libexec/ublue-user-setup
index bc46431418f..3d92e17579d 100755
--- a/system_files/shared/usr/libexec/ublue-user-setup
+++ b/system_files/shared/usr/libexec/ublue-user-setup
@@ -51,6 +51,10 @@ if [[ ":Framework:" =~ ":$VEN_ID:" ]]; then
     dconf write /org/gnome/shell/extensions/Logo-menu/menu-button-icon-image 31
     echo 'Setting touch scroll type'
     dconf write /org/gnome/desktop/peripherals/mouse/natural-scroll true
+    if [[ $SYS_ID == "Laptop ("* ]]; then
+      echo 'Applying font fix for Framework 13'
+      dconf write /org/gnome/desktop/interface/text-scaling-factor 1.25
+    fi
     touch "$UBLUE_CONFIG_DIR/framework-initialized"
   fi
 fi