diff --git a/packages/cli/src/cli/build.rs b/packages/cli/src/cli/build.rs
index 6bd93ff6a..c30cb29e8 100644
--- a/packages/cli/src/cli/build.rs
+++ b/packages/cli/src/cli/build.rs
@@ -111,12 +111,7 @@ impl Build {
 
         let temp = gen_page(&crate_config, build_result.assets.as_ref(), false);
 
-        let mut file = std::fs::File::create(
-            crate_config
-                .crate_dir
-                .join(crate_config.dioxus_config.application.out_dir.clone())
-                .join("index.html"),
-        )?;
+        let mut file = std::fs::File::create(crate_config.out_dir().join("index.html"))?;
         file.write_all(temp.as_bytes())?;
 
         // #[cfg(feature = "plugin")]
diff --git a/packages/cli/src/cli/clean.rs b/packages/cli/src/cli/clean.rs
index b37f7f25c..a66bac3ac 100644
--- a/packages/cli/src/cli/clean.rs
+++ b/packages/cli/src/cli/clean.rs
@@ -19,9 +19,9 @@ impl Clean {
             return custom_error!("Cargo clean failed.");
         }
 
-        let out_dir = &crate_config.dioxus_config.application.out_dir;
-        if crate_config.crate_dir.join(out_dir).is_dir() {
-            remove_dir_all(crate_config.crate_dir.join(out_dir))?;
+        let out_dir = &crate_config.out_dir();
+        if out_dir.is_dir() {
+            remove_dir_all(out_dir)?;
         }
 
         let fullstack_out_dir = crate_config.fullstack_out_dir();
diff --git a/packages/cli/src/cli/serve.rs b/packages/cli/src/cli/serve.rs
index 5a483ec54..3ace461ef 100644
--- a/packages/cli/src/cli/serve.rs
+++ b/packages/cli/src/cli/serve.rs
@@ -73,9 +73,7 @@ impl Serve {
     ) -> anyhow::Result<()> {
         let serve_html = gen_page(crate_config, manifest, true);
 
-        let dist_path = crate_config
-            .crate_dir
-            .join(crate_config.dioxus_config.application.out_dir.clone());
+        let dist_path = crate_config.out_dir();
         if !dist_path.is_dir() {
             create_dir_all(&dist_path)?;
         }
diff --git a/packages/cli/src/server/web/mod.rs b/packages/cli/src/server/web/mod.rs
index b5d7a4486..9c2db2a72 100644
--- a/packages/cli/src/server/web/mod.rs
+++ b/packages/cli/src/server/web/mod.rs
@@ -289,14 +289,9 @@ async fn setup_router(
                 {
                     let body = Full::from(
                         // TODO: Cache/memoize this.
-                        std::fs::read_to_string(
-                            file_service_config
-                                .crate_dir
-                                .join(file_service_config.out_dir())
-                                .join("index.html"),
-                        )
-                        .ok()
-                        .unwrap(),
+                        std::fs::read_to_string(file_service_config.out_dir().join("index.html"))
+                            .ok()
+                            .unwrap(),
                     )
                     .map_err(|err| match err {})
                     .boxed();
@@ -317,7 +312,7 @@ async fn setup_router(
                 Ok(response)
             },
         )
-        .service(ServeDir::new(config.crate_dir.join(config.out_dir())));
+        .service(ServeDir::new(config.out_dir()));
 
     // Setup websocket
     let mut router = Router::new().route("/_dioxus/ws", get(ws_handler));