diff --git a/mih_ui/flatpak/flatpak_build_commands b/mih_ui/flatpak/flatpak_build_commands
index e7614cf7..76b7bdb3 100644
--- a/mih_ui/flatpak/flatpak_build_commands
+++ b/mih_ui/flatpak/flatpak_build_commands
@@ -1,11 +1,19 @@
-# Uninstall Old Version
-flatpak uninstall --user za.co.mzansiinnovationhub.mih
+# Uninstall old version (safe if not installed)
+flatpak uninstall --user za.co.mzansiinnovationhub.mih || true
 
 # Remove old build data
-rm -rf .flatpak-builder/ build-dir/
+rm -rf .flatpak-builder/ build-dir/ repo/
 
-# Build and install flatpak
+# Lint before building (catch errors early)
+flatpak run --command=flatpak-builder-lint org.flatpak.Builder manifest za.co.mzansiinnovationhub.mih.yml
+flatpak run --command=flatpak-builder-lint org.flatpak.Builder appstream za.co.mzansiinnovationhub.mih.metainfo.xml
+
+# Dev build — fast iteration and local testing
 flatpak-builder --user --install --force-clean build-dir za.co.mzansiinnovationhub.mih.yml
 
-# Run flatpak app
+# Run and test the app
 flatpak run za.co.mzansiinnovationhub.mih
+
+# Flathub build — simulates Flathub's build environment, run before submitting
+flatpak run --command=flathub-build org.flatpak.Builder --install za.co.mzansiinnovationhub.mih.yml
+flatpak run --command=flatpak-builder-lint org.flatpak.Builder repo repo
diff --git a/mih_ui/flatpak/za.co.mzansiinnovationhub.mih.metainfo.xml b/mih_ui/flatpak/za.co.mzansiinnovationhub.mih.metainfo.xml
index e41d9c7f..a28cabc5 100644
--- a/mih_ui/flatpak/za.co.mzansiinnovationhub.mih.metainfo.xml
+++ b/mih_ui/flatpak/za.co.mzansiinnovationhub.mih.metainfo.xml
@@ -125,7 +125,6 @@
     <content_attribute id="violence-realistic">none</content_attribute>
     <content_attribute id="violence-bloodshed">none</content_attribute>
     <content_attribute id="violence-sexual">none</content_attribute>
-    <content_attribute id="violence-desensitization">none</content_attribute>
     <content_attribute id="drugs-alcohol">none</content_attribute>
     <content_attribute id="drugs-narcotics">none</content_attribute>
     <content_attribute id="drugs-tobacco">none</content_attribute>
@@ -134,8 +133,6 @@
     <content_attribute id="sex-homosexuality">none</content_attribute>
     <content_attribute id="sex-prostitution">none</content_attribute>
     <content_attribute id="sex-adultery">none</content_attribute>
-    <content_attribute id="profanity-slurs">none</content_attribute>
-    <content_attribute id="profanity-addictive">none</content_attribute>
     <content_attribute id="language-discrimination">none</content_attribute>
     <content_attribute id="money-gambling">none</content_attribute>
     <content_attribute id="money-purchasing">none</content_attribute>