MostUsing
diff --git a/‎coderd/database/dump.sql
+2-2 b/‎coderd/database/dump.sql
+2-2
diff --git a/‎coderd/database/migrations/000239_provisioner_daemon_org_constraint.down.sql
+5 b/‎coderd/database/migrations/000239_provisioner_daemon_org_constraint.down.sql
+5
diff --git a/‎coderd/database/migrations/000239_provisioner_daemon_org_constraint.up.sql
+5 b/‎coderd/database/migrations/000239_provisioner_daemon_org_constraint.up.sql
+5
diff --git a/‎coderd/database/queries.sql.go
+1-4 b/‎coderd/database/queries.sql.go
+1-4
diff --git a/‎coderd/database/queries/provisionerdaemons.sql
+1-4 b/‎coderd/database/queries/provisionerdaemons.sql
+1-4
diff --git a/‎coderd/database/unique_constraint.go
+1-1 b/‎coderd/database/unique_constraint.go
+1-1
diff --git a/‎enterprise/coderd/provisionerdaemons_test.go
+35 b/‎enterprise/coderd/provisionerdaemons_test.go
+35
@@ -0,0 +1,5 @@
+CREATE UNIQUE INDEX idx_provisioner_daemons_name_owner_key ON provisioner_daemons USING btree (name, lower(COALESCE((tags ->> 'owner'::text), ''::text)));
+
+COMMENT ON INDEX idx_provisioner_daemons_name_owner_key IS 'Allow unique provisioner daemon names by user';
+
+DROP INDEX idx_provisioner_daemons_org_name_owner_key;
@@ -0,0 +1,5 @@
+CREATE UNIQUE INDEX idx_provisioner_daemons_org_name_owner_key ON provisioner_daemons USING btree (organization_id, name, lower(COALESCE((tags ->> 'owner'::text), ''::text)));
+
+COMMENT ON INDEX idx_provisioner_daemons_org_name_owner_key IS 'Allow unique provisioner daemon names by organization and user';
+
+DROP INDEX idx_provisioner_daemons_name_owner_key;
@@ -45,16 +45,13 @@ VALUES (
 	@version,
 	@organization_id,
 	@api_version
-) ON CONFLICT("name", LOWER(COALESCE(tags ->> 'owner'::text, ''::text))) DO UPDATE SET
+) ON CONFLICT("organization_id", "name", LOWER(COALESCE(tags ->> 'owner'::text, ''::text))) DO UPDATE SET
 	provisioners = @provisioners,
 	tags = @tags,
 	last_seen_at = @last_seen_at,
 	"version" = @version,
 	api_version = @api_version,
 	organization_id = @organization_id
-WHERE
-	-- Only ones with the same tags are allowed clobber
-	provisioner_daemons.tags <@ @tags :: jsonb
 RETURNING *;
 
 -- name: UpdateProvisionerDaemonLastSeenAt :exec
 
@@ -347,6 +347,41 @@ func TestProvisionerDaemonServe(t *testing.T) {
 		}
 	})
 
+	t.Run("ChangeTags", func(t *testing.T) {
+		t.Parallel()
+		client, user := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
+			Features: license.Features{
+				codersdk.FeatureExternalProvisionerDaemons: 1,
+			},
+		}})
+		another, _ := coderdtest.CreateAnotherUser(t, client, user.OrganizationID, rbac.ScopedRoleOrgAdmin(user.OrganizationID))
+		ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
+		defer cancel()
+		req := codersdk.ServeProvisionerDaemonRequest{
+			ID:           uuid.New(),
+			Name:         testutil.MustRandString(t, 63),
+			Organization: user.OrganizationID,
+			Provisioners: []codersdk.ProvisionerType{
+				codersdk.ProvisionerTypeEcho,
+			},
+			Tags: map[string]string{
+				provisionersdk.TagScope: provisionersdk.ScopeOrganization,
+			},
+		}
+		_, err := another.ServeProvisionerDaemon(ctx, req)
+		require.NoError(t, err)
+
+		// add tag
+		req.Tags["new"] = "tag"
+		_, err = another.ServeProvisionerDaemon(ctx, req)
+		require.NoError(t, err)
+
+		// remove tag
+		delete(req.Tags, "new")
+		_, err = another.ServeProvisionerDaemon(ctx, req)
+		require.NoError(t, err)
+	})
+
 	t.Run("PSK_daily_cost", func(t *testing.T) {
 		t.Parallel()
 		const provPSK = `provisionersftw`