diff --git a/charts/fp/values.yaml b/charts/fp/values.yaml
index 614945e..b42535f 100644
--- a/charts/fp/values.yaml
+++ b/charts/fp/values.yaml
@@ -26,7 +26,7 @@ scout:
   cdnBucketUrl: https://fp-dev.b-cdn.net
   s3BucketName: fp-dev
 strapi:
-  imageName: gitea.futureporn.net/futureporn/strapi:latest
+  imageName: fp/strapi
   port: 1339
   url: https://strapi.fp.sbtp.xyz
   hostname: strapi.fp.sbtp.xyz
diff --git a/flux/apps/base/fp/release.yaml b/flux/apps/base/fp/release.yaml
index d062ac2..fbb1bef 100644
--- a/flux/apps/base/fp/release.yaml
+++ b/flux/apps/base/fp/release.yaml
@@ -40,8 +40,9 @@ spec:
       hostname: next.futureporn.svc.cluster.local
       cdnBucketUrl: https://fp-dev.b-cdn.net
       s3BucketName: fp-dev
+      imageName: fp/scout
     strapi:
-      imageName: gitea.futureporn.net/futureporn/strapi:latest
+      imageName: fp/strapi
       port: 1339
       url: https://strapi.fp.sbtp.xyz
       hostname: strapi.futureporn.svc.cluster.local
diff --git a/flux/apps/staging/fp-values.yaml b/flux/apps/staging/fp-values.yaml
index a18b672..2379d25 100644
--- a/flux/apps/staging/fp-values.yaml
+++ b/flux/apps/staging/fp-values.yaml
@@ -10,9 +10,11 @@ spec:
     scout:
       cdnBucketUrl: https://fp-dev.b-cdn.net
       s3BucketName: fp-dev
+      imageName: gitea.futureporn.net/futureporn/scout:latest
     strapi:
       url: https://strapi.sbtp.xyz
       hostname: strapi.fp.sbtp.xyz
+      imageName: gitea.futureporn.net/futureporn/strapi:latest
     managedBy: Helm
     certManager:
       issuer: letsencrypt-staging
\ No newline at end of file