diff --git a/packages/backend/src/registry.ts b/packages/backend/src/registry.ts
index 894792b5..2da105c7 100644
--- a/packages/backend/src/registry.ts
+++ b/packages/backend/src/registry.ts
@@ -376,8 +376,7 @@ export class Registry {
     return records.filter((record: AppDeploymentRecord) =>
       deployments.some(
         (deployment) =>
-          deployment.applicationDeploymentRequestId === record.attributes.request &&
-          record.attributes.url.includes(deployment.id)
+          deployment.applicationDeploymentRequestId === record.attributes.request
       )
     );
   }
diff --git a/packages/backend/src/service.ts b/packages/backend/src/service.ts
index 22ae9bfb..c116aaaf 100644
--- a/packages/backend/src/service.ts
+++ b/packages/backend/src/service.ts
@@ -231,6 +231,9 @@ export class Service {
 
           if (oldDNSDeployment) {
             await this.db.deleteDeploymentById(oldDNSDeployment.id);
+            if (oldDNSDeployment.domain) {
+              await this.db.updateDeploymentById(deployment.id, { domain: oldDNSDeployment.domain})
+            }
           }
         }
 
@@ -697,7 +700,6 @@ export class Service {
       await this.db.updateDeploymentById(dnsDeployment.id, {
         applicationDeploymentRequestId,
         applicationDeploymentRequestData,
-        domainId: domain?.id ?? null
       });
     }
 
@@ -716,7 +718,6 @@ export class Service {
     await this.db.updateDeploymentById(deployment.id, {
       applicationDeploymentRequestId,
       applicationDeploymentRequestData,
-      domainId: domain?.id ?? null
     });
 
     return deployment;
@@ -1216,7 +1217,11 @@ export class Service {
             projectId: deployment.project.id,
             deployer: deployment.deployer,
             isDNS: true
-          }
+          },
+          relations: {
+            project: true,
+            deployer: true,
+          },
         })
 
         if (!dnsDeployment) {
@@ -1226,7 +1231,7 @@ export class Service {
         }
 
         await this.laconicRegistry.createApplicationDeploymentRemovalRequest({
-          deploymentId: dnsDeployment.id,
+          deploymentId: dnsDeployment.applicationDeploymentRecordId!,
           deployerLrn: dnsDeployment.deployer.deployerLrn,
           auctionId: dnsDeployment.project.auctionId,
           payment: dnsDeployment.project.txHash