diff --git a/mih_ui/.gitignore b/mih_ui/.gitignore
index ceded0b4..844c8fea 100644
--- a/mih_ui/.gitignore
+++ b/mih_ui/.gitignore
@@ -50,6 +50,6 @@ app.*.map.json
 /config/
 
 #Flatpak build files
-flatpak/build-dir/
-flatpak/.flatpak-builder/
+build-dir/
+.flatpak-builder/
 
diff --git a/mih_ui/flatpak/za.co.mzansiinnovationhub.mih.desktop b/mih_ui/app/share/applications/za.co.mzansiinnovationhub.mih.desktop
similarity index 100%
rename from mih_ui/flatpak/za.co.mzansiinnovationhub.mih.desktop
rename to mih_ui/app/share/applications/za.co.mzansiinnovationhub.mih.desktop
diff --git a/mih_ui/flatpak/za.co.mzansiinnovationhub.mih.png b/mih_ui/app/share/icons/hicolor/256x256/apps/za.co.mzansiinnovationhub.mih.png
similarity index 100%
rename from mih_ui/flatpak/za.co.mzansiinnovationhub.mih.png
rename to mih_ui/app/share/icons/hicolor/256x256/apps/za.co.mzansiinnovationhub.mih.png
diff --git a/mih_ui/flatpak/za.co.mzansiinnovationhub.mih.metainfo.xml b/mih_ui/app/share/metainfo/za.co.mzansiinnovationhub.mih.metainfo.xml
similarity index 100%
rename from mih_ui/flatpak/za.co.mzansiinnovationhub.mih.metainfo.xml
rename to mih_ui/app/share/metainfo/za.co.mzansiinnovationhub.mih.metainfo.xml
diff --git a/mih_ui/flatpak/.gitignore b/mih_ui/flatpak/.gitignore
new file mode 100644
index 00000000..753e5981
--- /dev/null
+++ b/mih_ui/flatpak/.gitignore
@@ -0,0 +1,2 @@
+# Generated by flutpak — https://github.com/o-murphy/flutpak
+generated/
diff --git a/mih_ui/flatpak/flatpak_build_commands b/mih_ui/flatpak/flatpak_build_commands
deleted file mode 100644
index 76b7bdb3..00000000
--- a/mih_ui/flatpak/flatpak_build_commands
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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/ repo/
-
-# 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 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/mih-wrapper.sh b/mih_ui/flatpak/mih-wrapper.sh
new file mode 100644
index 00000000..85d6bf04
--- /dev/null
+++ b/mih_ui/flatpak/mih-wrapper.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+# Generated by flutpak — https://github.com/o-murphy/flutpak
+APP=/app/mih
+export LD_LIBRARY_PATH="$APP/lib:${LD_LIBRARY_PATH:-}"
+exec "$APP/mih" "$@"
diff --git a/mih_ui/flatpak/za.co.mzansiinnovationhub.mih.yml b/mih_ui/flatpak/za.co.mzansiinnovationhub.mih.yml
index c296c43c..c72b8eff 100644
--- a/mih_ui/flatpak/za.co.mzansiinnovationhub.mih.yml
+++ b/mih_ui/flatpak/za.co.mzansiinnovationhub.mih.yml
@@ -1,43 +1,39 @@
-id: za.co.mzansiinnovationhub.mih
-runtime: org.gnome.Platform
-runtime-version: "49"
-sdk: org.gnome.Sdk
-command: mzansi_innovation_hub
-
+app-id: za.co.mzansiinnovationhub.mih
+runtime: org.freedesktop.Platform
+runtime-version: "25.08"
+sdk: org.freedesktop.Sdk
+sdk-extensions:
+  - org.freedesktop.Sdk.Extension.llvm20
+command: mih
 finish-args:
   - --share=ipc
-  - --share=network
   - --socket=fallback-x11
   - --socket=wayland
   - --device=dri
-  - --env=__EGL_VENDOR_LIBRARY_FILENAMES=/usr/lib/x86_64-linux-gnu/GL/glvnd/egl_vendor.d/50_mesa.json
-
 modules:
-  - name: mzansi-innovation-hub
+  - name: mih
     buildsystem: simple
-    sources:
-      - type: archive
-        url: https://git.mzansi-innovation-hub.co.za/yaso_meth/mih-project/releases/download/v.1.3.0/mzansi_innovation_hub.tar.gz
-        archive-type: tar-gzip
-        strip-components: 0
-        sha256: 8efff8baf8d9be44b70f3af500d985e80f2eb5a25cc421ce5c4f88b83f44ebe0
-      - type: file
-        path: za.co.mzansiinnovationhub.mih.desktop
-      - type: file
-        path: za.co.mzansiinnovationhub.mih.metainfo.xml
-      - type: file
-        path: za.co.mzansiinnovationhub.mih.png
-
+    build-options:
+      arch:
+        x86_64:
+          env:
+            BUNDLE_PATH: build/linux/x64/release/bundle
+        aarch64:
+          env:
+            BUNDLE_PATH: build/linux/arm64/release/bundle
+      append-path: /usr/lib/sdk/llvm20/bin:/var/lib/flutter/bin
+      prepend-ld-library-path: /usr/lib/sdk/llvm20/lib
+      env:
+        PUB_CACHE: /run/build/mih/.pub-cache
     build-commands:
-      - mkdir -p /app/bin
-      - mkdir -p /app/share/applications
-      - mkdir -p /app/share/metainfo
-      - mkdir -p /app/share/icons/hicolor/256x256/apps
-
-      - cp mzansi_innovation_hub /app/bin/
-      - cp -r lib/ /app/bin/
-      - cp -r data/ /app/bin/
-
-      - install -Dm644 za.co.mzansiinnovationhub.mih.desktop /app/share/applications/za.co.mzansiinnovationhub.mih.desktop
-      - install -Dm644 za.co.mzansiinnovationhub.mih.png /app/share/icons/hicolor/256x256/apps/za.co.mzansiinnovationhub.mih.png
-      - install -Dm644 za.co.mzansiinnovationhub.mih.metainfo.xml /app/share/metainfo/za.co.mzansiinnovationhub.mih.metainfo.xml
+      - flutter pub get --offline
+      - flutter build linux --release --no-pub
+      - mkdir -p /app/mih
+      - cp -r "$BUNDLE_PATH"/. /app/mih/
+      - install -Dm755 flatpak/mih-wrapper.sh /app/bin/mih
+      - install -Dm644 app/share/metainfo/za.co.mzansiinnovationhub.mih.metainfo.xml /app/share/metainfo/za.co.mzansiinnovationhub.mih.metainfo.xml
+      - install -Dm644 app/share/applications/za.co.mzansiinnovationhub.mih.desktop /app/share/applications/za.co.mzansiinnovationhub.mih.desktop
+      - install -Dm644 app/share/icons/hicolor/256x256/apps/za.co.mzansiinnovationhub.mih.png /app/share/icons/hicolor/256x256/apps/za.co.mzansiinnovationhub.mih.png
+    sources:
+      - type: git
+        url: https://git.mzansi-innovation-hub.co.za/yaso_meth/mih-project.git
diff --git a/mih_ui/flutpak.yaml b/mih_ui/flutpak.yaml
new file mode 100644
index 00000000..4f752b21
--- /dev/null
+++ b/mih_ui/flutpak.yaml
@@ -0,0 +1,3 @@
+app-id: za.co.mzansiinnovationhub.mih
+flutter:
+  ref: "3.44.1"