diff --git a/ffplayout-api/src/utils/mod.rs b/ffplayout-api/src/utils/mod.rs
index 891a659d..ca94fbbd 100644
--- a/ffplayout-api/src/utils/mod.rs
+++ b/ffplayout-api/src/utils/mod.rs
@@ -163,18 +163,18 @@ pub fn db_path() -> Result<&'static str, Box<dyn std::error::Error>> {
 }
 
 pub fn public_path() -> PathBuf {
-    let path = PathBuf::from("/usr/share/ffplayout/public/");
-
-    if path.is_dir() {
-        return path;
-    }
-
     let path = PathBuf::from("./ffplayout-frontend/.output/public/");
 
     if cfg!(debug_assertions) && path.is_dir() {
         return path;
     }
 
+    let path = PathBuf::from("/usr/share/ffplayout/public/");
+
+    if path.is_dir() {
+        return path;
+    }
+
     PathBuf::from("./public/")
 }
 
diff --git a/ffplayout-frontend b/ffplayout-frontend
index 8eb543dd..28bcfcd1 160000
--- a/ffplayout-frontend
+++ b/ffplayout-frontend
@@ -1 +1 @@
-Subproject commit 8eb543ddae035e448ea0886ec1d44256de2e6f07
+Subproject commit 28bcfcd1a399a9dd5363541f5f01203c7d968e18