diff --git a/cmd/proboctl/CHANGELOG.md b/cmd/proboctl/CHANGELOG.md
index 825c32f0d..1933e2634 100644
--- a/cmd/proboctl/CHANGELOG.md
+++ b/cmd/proboctl/CHANGELOG.md
@@ -1 +1,3 @@
 # Changelog
+
+All notable changes to the `proboctl` CLI will be documented in this file.
diff --git a/pkg/coredata/common_third_party_domain.go b/pkg/coredata/common_third_party_domain.go
index a1056dcc1..e9406144a 100644
--- a/pkg/coredata/common_third_party_domain.go
+++ b/pkg/coredata/common_third_party_domain.go
@@ -136,10 +136,9 @@ INSERT INTO common_third_party_domains (
     @created_at,
     @updated_at
 )
-ON CONFLICT (domain) DO UPDATE
+ON CONFLICT (common_third_party_id, domain) DO UPDATE
 SET
-    common_third_party_id = EXCLUDED.common_third_party_id,
-    updated_at            = EXCLUDED.updated_at
+    updated_at = EXCLUDED.updated_at
 RETURNING (xmax = 0) AS inserted
 `
 
diff --git a/pkg/coredata/migrations/20260513T105453Z.sql b/pkg/coredata/migrations/20260513T105453Z.sql
index b7a47e1f8..94874a34a 100644
--- a/pkg/coredata/migrations/20260513T105453Z.sql
+++ b/pkg/coredata/migrations/20260513T105453Z.sql
@@ -23,8 +23,8 @@ CREATE TABLE common_third_party_domains (
     updated_at            TIMESTAMP WITH TIME ZONE NOT NULL
 );
 
-CREATE UNIQUE INDEX common_third_party_domains_domain_key
-    ON common_third_party_domains (domain);
+CREATE UNIQUE INDEX common_third_party_domains_party_domain_key
+    ON common_third_party_domains (common_third_party_id, domain);
 
 CREATE INDEX idx_common_third_party_domains_third_party
     ON common_third_party_domains (common_third_party_id);
diff --git a/pkg/proboctl/pgconn/pgconn.go b/pkg/proboctl/pgconn/pgconn.go
index ca094e079..dbb26c1d5 100644
--- a/pkg/proboctl/pgconn/pgconn.go
+++ b/pkg/proboctl/pgconn/pgconn.go
@@ -25,7 +25,7 @@ import (
 func NewPgClientFromDSN(dsn string) (*pg.Client, error) {
 	u, err := url.Parse(dsn)
 	if err != nil {
-		return nil, fmt.Errorf("cannot parse DSN (check URL format)")
+		return nil, fmt.Errorf("cannot parse DSN: %w", err)
 	}
 
 	var opts []pg.Option
diff --git a/pkg/proboctl/seed/common-third-parties/data/data.json b/pkg/proboctl/seed/common-third-parties/data/data.json
index 4a60cd62f..368b22159 100644
--- a/pkg/proboctl/seed/common-third-parties/data/data.json
+++ b/pkg/proboctl/seed/common-third-parties/data/data.json
@@ -761,7 +761,7 @@
     "name": "Beamer",
     "category": "MARKETING",
     "domains": [
-      "hotjar.com"
+      "getbeamer.com"
     ],
     "websiteUrl": "https://www.getbeamer.com",
     "legalName": "Beamer, Inc.",