diff --git a/container.yaml b/container.yaml
index ed96a0f..3fdb6e9 100644
--- a/container.yaml
+++ b/container.yaml
@@ -1,52 +1,60 @@
 flatpak:
     id: org.fedoraproject.Sdk.Extension.llvm19
-    branch: f41
+    branch: f44
     build-extension: true
     runtime: org.fedoraproject.Sdk
-    runtime-version: f41
+    runtime-version: f44
     sdk: org.fedoraproject.Sdk
-    name: f41/llvm19
+    name: f44/llvm19
     component: llvm19-flatpak
     packages:
-    - clang
-    - clang-analyzer
-    - clang-devel
-    - clang-libs
-    - clang-tools-extra
-    - clang-tools-extra-devel
-    - compiler-rt
-    - git-clang-format
+    - clang19
+    - clang19-analyzer
+    - clang19-devel
+    - clang19-libs
+    - clang19-tools-extra
+    - clang19-tools-extra-devel
+    - compiler-rt19
+    - git-clang-format19
     - libcxx
     - libcxx-devel
     - libcxxabi
     - libcxxabi-devel
-    - libomp
-    - libomp-devel
-    - lld
-    - lld-devel
-    - lld-libs
-    - lldb
-    - lldb-devel
-    - llvm
-    - llvm-cmake-utils
-    - llvm-devel
-    - llvm-libs
-    - llvm-test
+    - libomp19
+    - libomp19-devel
+    - lld19
+    - lld19-devel
+    - lld19-libs
+    - lldb19
+    - lldb19-devel
+    - llvm19
+    - llvm19-cmake-utils
+    - llvm19-devel
+    - llvm19-googletest
+    - llvm19-libs
+    - llvm-libunwind
+    - llvm-libunwind-devel
+    - llvm19-test
     - python3-clang
     - python3-lit
     - python3-lldb
+    - llvm19-flatpak-config
     # for cleanup-commands (part of runtime)
     - coreutils-single
     - rpm
     - sed
     cleanup-commands: |
-        for f in `rpm -ql clang{,-libs,-devel,-tools-extra{,-devel}} compiler-rt git-clang-format lib{cxx{,abi},omp}{,-devel} lld{,-devel,-libs} lldb{,-devel} llvm{,-cmake-utils,-devel,-libs,-test} python3-{clang,lit,lldb}`; do \
-             case $f in /usr/lib/.build-id*) continue ;; esac ; \
-             if [ ! -d $f ]; then d=$(echo $f | sed -e 's|^/usr/\(.*\)/[^/]*$|/app/\1|;s|^\(/etc/.*\)/[^/]*|/app/\1|'); mkdir -p ${d/\/lib64/\/lib}; cp -a $f ${d/\/lib64/\/lib}; fi; \
+        mkdir -p /app/{bin,include,lib64,libexec,share}
+        for f in `rpm -aql clang19* compiler-rt19 git-clang-format19 libcxx* libomp19* lld19* lldb19* llvm19* llvm-libunwind* python3-{clang,lit,lldb}`; do \
+             case $f in /usr/lib/.build-id*|/app/*) continue ;; esac ; \
+             if [ ! -d $f ]; then d=$(echo $f | sed -e 's|^/usr/\(.*\)/[^/]*$|/app/\1|;s|^\(/etc/.*\)/[^/]*|/app/\1|'); mkdir -p $d; mv $f $d; fi; \
         done
-        ln -sfn llvm-config-64 /app/bin/llvm-config
-        ln -sfn ../share/clang/clang-format-diff.py /app/bin/clang-format-diff
+        mv /app/lib64/llvm19/bin/* /app/bin/
+        mv /app/lib64/llvm19/include/* /app/include/
+        mv /app/lib64/llvm19/lib/* /app/lib64/
+        mv /app/lib64/llvm19/libexec/* /app/libexec/
+        mv /app/lib64/llvm19/share/* /app/share/
         for f in /app/bin/*-19; do if [ -L $f -a -f ${f%-19} ]; then rm $f; fi; done
+        ln -sfn ../../../liblldb.so.19.1 /app/lib64/python3.14/site-packages/lldb/_lldb.so
+        ln -sfn ../share/clang/clang-format-diff.py /app/bin/clang-format-diff
         rm -f /app/bin/ld
-        echo -e "#!/bin/sh\nexport PATH=\$PATH:/usr/lib/sdk/llvm19/bin" > /app/enable.sh
-        chmod +x /app/enable.sh