diff --git a/.github/workflows/app-builder.yaml b/.github/workflows/app-builder.yaml
index 344aa415e..e929e05d9 100644
--- a/.github/workflows/app-builder.yaml
+++ b/.github/workflows/app-builder.yaml
@@ -141,7 +141,7 @@ jobs:
         id: bake
         with:
           files: |
-            ./docker-bake.hcl
+            ./apps/${{ inputs.app }}/docker-bake.hcl
             cwd://${{ runner.temp }}/docker-metadata-action-bake.json
           set: |
             *.args.VENDOR="TrueForge"
diff --git a/porting/tvheadend/Dockerfile b/apps/tvheadend/Dockerfile
similarity index 98%
rename from porting/tvheadend/Dockerfile
rename to apps/tvheadend/Dockerfile
index 476335cf1..b1f83f6e7 100644
--- a/porting/tvheadend/Dockerfile
+++ b/apps/tvheadend/Dockerfile
@@ -1,6 +1,6 @@
 ############## picons stage ##############
 # built by https://github.com/linuxserver/picons-builder
-FROM ghcr.io/trueforge-org/python:3.13.12 AS piconsstage
+FROM ghcr.io/trueforge-org/python:3.14.4 AS piconsstage
 USER root
 RUN tar czf /picons.tar.bz2 -T /dev/null
 
diff --git a/porting/tvheadend/container-test.yaml b/apps/tvheadend/container-test.yaml
similarity index 100%
rename from porting/tvheadend/container-test.yaml
rename to apps/tvheadend/container-test.yaml
diff --git a/porting/tvheadend/docker-bake.hcl b/apps/tvheadend/docker-bake.hcl
similarity index 100%
rename from porting/tvheadend/docker-bake.hcl
rename to apps/tvheadend/docker-bake.hcl
diff --git a/porting/tvheadend/patches/config.guess b/apps/tvheadend/patches/config.guess
similarity index 100%
rename from porting/tvheadend/patches/config.guess
rename to apps/tvheadend/patches/config.guess
diff --git a/porting/tvheadend/patches/config.sub b/apps/tvheadend/patches/config.sub
similarity index 100%
rename from porting/tvheadend/patches/config.sub
rename to apps/tvheadend/patches/config.sub
diff --git a/porting/tvheadend/root/defaults/7a5edfbe189851e5b1d1df19c93962f0 b/apps/tvheadend/root/defaults/7a5edfbe189851e5b1d1df19c93962f0
similarity index 100%
rename from porting/tvheadend/root/defaults/7a5edfbe189851e5b1d1df19c93962f0
rename to apps/tvheadend/root/defaults/7a5edfbe189851e5b1d1df19c93962f0
diff --git a/porting/tvheadend/root/defaults/comskip.ini.org b/apps/tvheadend/root/defaults/comskip.ini.org
similarity index 100%
rename from porting/tvheadend/root/defaults/comskip.ini.org
rename to apps/tvheadend/root/defaults/comskip.ini.org
diff --git a/porting/tvheadend/root/defaults/config b/apps/tvheadend/root/defaults/config
similarity index 100%
rename from porting/tvheadend/root/defaults/config
rename to apps/tvheadend/root/defaults/config
diff --git a/porting/tvheadend/root/usr/bin/tv_grab_file b/apps/tvheadend/root/usr/bin/tv_grab_file
similarity index 100%
rename from porting/tvheadend/root/usr/bin/tv_grab_file
rename to apps/tvheadend/root/usr/bin/tv_grab_file
diff --git a/porting/tvheadend/root/usr/bin/tv_grab_url b/apps/tvheadend/root/usr/bin/tv_grab_url
similarity index 100%
rename from porting/tvheadend/root/usr/bin/tv_grab_url
rename to apps/tvheadend/root/usr/bin/tv_grab_url
diff --git a/porting/tvheadend/root/usr/bin/tv_grab_wg b/apps/tvheadend/root/usr/bin/tv_grab_wg
similarity index 100%
rename from porting/tvheadend/root/usr/bin/tv_grab_wg
rename to apps/tvheadend/root/usr/bin/tv_grab_wg
diff --git a/porting/tvheadend/settings.yaml b/apps/tvheadend/settings.yaml
similarity index 100%
rename from porting/tvheadend/settings.yaml
rename to apps/tvheadend/settings.yaml
diff --git a/porting/tvheadend/start.sh b/apps/tvheadend/start.sh
similarity index 100%
rename from porting/tvheadend/start.sh
rename to apps/tvheadend/start.sh