diff --git a/bin/core/src/requests/write/build.rs b/bin/core/src/requests/write/build.rs
index 2bd5c7697..3c70cbc1d 100644
--- a/bin/core/src/requests/write/build.rs
+++ b/bin/core/src/requests/write/build.rs
@@ -76,6 +76,7 @@ impl Resolve<CopyBuild, RequestUser> for State {
         CopyBuild { name, id }: CopyBuild,
         user: RequestUser,
     ) -> anyhow::Result<Build> {
+        let name = to_monitor_name(&name);
         let Build {
             config,
             description,
diff --git a/bin/core/src/requests/write/deployment.rs b/bin/core/src/requests/write/deployment.rs
index 65634c7ff..09223366f 100644
--- a/bin/core/src/requests/write/deployment.rs
+++ b/bin/core/src/requests/write/deployment.rs
@@ -98,6 +98,7 @@ impl Resolve<CopyDeployment, RequestUser> for State {
         CopyDeployment { name, id }: CopyDeployment,
         user: RequestUser,
     ) -> anyhow::Result<Deployment> {
+        let name = to_monitor_name(&name);
         let Deployment {
             config,
             description,
diff --git a/bin/core/src/requests/write/server.rs b/bin/core/src/requests/write/server.rs
index bffde99e3..39254942e 100644
--- a/bin/core/src/requests/write/server.rs
+++ b/bin/core/src/requests/write/server.rs
@@ -21,21 +21,25 @@ use crate::{
 
 #[async_trait]
 impl Resolve<CreateServer, RequestUser> for State {
-    async fn resolve(&self, req: CreateServer, user: RequestUser) -> anyhow::Result<Server> {
+    async fn resolve(
+        &self,
+        CreateServer { name, config }: CreateServer,
+        user: RequestUser,
+    ) -> anyhow::Result<Server> {
         if !user.is_admin && !user.create_server_permissions {
             return Err(anyhow!("user does not have create server permissions"));
         }
         let start_ts = monitor_timestamp();
         let server = Server {
             id: Default::default(),
-            name: req.name,
+            name,
             updated_at: start_ts,
             permissions: [(user.id.clone(), PermissionLevel::Update)]
                 .into_iter()
                 .collect(),
             description: Default::default(),
             tags: Default::default(),
-            config: req.config.into(),
+            config: config.into(),
             info: (),
         };
         let server_id = self
@@ -167,7 +171,7 @@ impl Resolve<UpdateServer, RequestUser> for State {
             .context("failed to update server on mongo")?;
 
         update.push_simple_log("server update", serde_json::to_string_pretty(&config)?);
-        
+
         let new_server: Server = self.get_resource(&id).await?;
 
         self.update_cache_for_server(&new_server).await;