diff --git a/comms/discovery/db/queries/get_user_tips.go b/comms/discovery/db/queries/get_user_tips.go
index 8c023fc54b6..81570bd09f9 100644
--- a/comms/discovery/db/queries/get_user_tips.go
+++ b/comms/discovery/db/queries/get_user_tips.go
@@ -11,7 +11,7 @@ const bulkGetTipReceivers = `
 select
   sender_user_id,
 	receiver_user_id
-from aggregate_user_tips
+from user_tips
 where
 	sender_user_id = :SenderUserID
   and receiver_user_id in (:ReceiverUserIDs)
diff --git a/comms/discovery/rpcz/chat_blast_test.go b/comms/discovery/rpcz/chat_blast_test.go
index d7b06cdc32d..e60bc473975 100644
--- a/comms/discovery/rpcz/chat_blast_test.go
+++ b/comms/discovery/rpcz/chat_blast_test.go
@@ -22,7 +22,7 @@ func TestChatBlast(t *testing.T) {
 	t4 := time.Now().Add(time.Second * -60).UTC()
 	t5 := time.Now().Add(time.Second * -50).UTC()
 	t6 := time.Now().Add(time.Second * -40).UTC()
-	t7 := time.Now().Add(time.Second * -30).UTC()
+	// t7 := time.Now().Add(time.Second * -30).UTC()
 
 	trackContentType := schema.AudienceContentType("track")
 
@@ -457,7 +457,7 @@ func TestChatBlast(t *testing.T) {
 	// ------- bi-directional blasting works with upgrade --------
 
 	// 69 re-opens inbox
-	err = chatSetPermissions(tx, 69, schema.All, nil, nil, t0)
+	err = chatSetPermissions(tx, 69, schema.All, nil, nil, t1)
 	assert.NoError(t, err)
 
 	// 68 sends a blast
@@ -471,7 +471,7 @@ func TestChatBlast(t *testing.T) {
 	assert.NoError(t, err)
 
 	// one side does upgrade
-	err = chatCreate(tx, 69, t7, schema.ChatCreateRPCParams{
+	err = chatCreate(tx, 69, t5, schema.ChatCreateRPCParams{
 		ChatID: chatId_68_69,
 		Invites: []schema.PurpleInvite{
 			{UserID: misc.MustEncodeHashID(68), InviteCode: "earlier"},
@@ -499,7 +499,7 @@ func TestChatBlast(t *testing.T) {
 	insert into user_tips
 		(slot, signature, sender_user_id, receiver_user_id, amount, created_at, updated_at)
 	values
-		(1, '', 201, 69, 2, $1, $1)
+		(1, 'd', 201, 69, 2, $1, $1)
 	`, t0)
 	assert.NoError(t, err)
 
diff --git a/comms/discovery/rpcz/chat_permissions_test.go b/comms/discovery/rpcz/chat_permissions_test.go
index da209d6788e..34f34a59a45 100644
--- a/comms/discovery/rpcz/chat_permissions_test.go
+++ b/comms/discovery/rpcz/chat_permissions_test.go
@@ -34,8 +34,13 @@ func TestChatPermissions(t *testing.T) {
 	_, err = tx.Exec("insert into follows (follower_user_id, followee_user_id, is_current, is_delete, created_at) values ($1, $2, true, false, now())", user1Id, user2Id)
 	assert.NoError(t, err)
 	// user 3 has tipped user 1
-	_, err = tx.Exec("insert into aggregate_user_tips (sender_user_id, receiver_user_id, amount) values ($1, $2, 100)", user3Id, user1Id)
-	assert.NoError(t, err)
+
+	tx.MustExec(`
+	insert into user_tips
+		(slot, signature, sender_user_id, receiver_user_id, amount, created_at, updated_at)
+	values
+		(1, 'c', $1, $2, 100, now(), now())
+	`, user3Id, user1Id)
 
 	assertPermissionValidation := func(tx *sqlx.Tx, sender int32, receiver int32, chatId string, errorExpected bool) {
 		assertChatCreateAllowed(t, tx, sender, receiver, !errorExpected)
diff --git a/comms/discovery/server/server_test.go b/comms/discovery/server/server_test.go
index 7519a7bd6c5..41a73041d00 100644
--- a/comms/discovery/server/server_test.go
+++ b/comms/discovery/server/server_test.go
@@ -512,7 +512,7 @@ func TestGetPermissions(t *testing.T) {
 	db.Conn.MustExec("truncate table users cascade")
 	db.Conn.MustExec("truncate table chat_permissions cascade")
 	db.Conn.MustExec("truncate table follows cascade")
-	db.Conn.MustExec("truncate table aggregate_user_tips cascade")
+	db.Conn.MustExec("truncate table user_tips cascade")
 
 	tx := db.Conn.MustBegin()
 
@@ -545,10 +545,20 @@ func TestGetPermissions(t *testing.T) {
 	tx.MustExec("insert into follows (follower_user_id, followee_user_id, is_current, is_delete, created_at) values ($1, $2, true, false, now())", user2Id, user1Id)
 
 	// user 2 has tipped user 3
-	tx.MustExec("insert into aggregate_user_tips (sender_user_id, receiver_user_id, amount) values ($1, $2, 5)", user2Id, user3Id)
+	tx.MustExec(`
+	insert into user_tips
+		(slot, signature, sender_user_id, receiver_user_id, amount, created_at, updated_at)
+	values
+		(1, 'a', $1, $2, 100, now(), now())
+	`, user2Id, user3Id)
 
 	// user 1 has tipped user 7
-	tx.MustExec("insert into aggregate_user_tips (sender_user_id, receiver_user_id, amount) values ($1, $2, 5)", user1Id, user7Id)
+	tx.MustExec(`
+	insert into user_tips
+		(slot, signature, sender_user_id, receiver_user_id, amount, created_at, updated_at)
+	values
+		(1, 'b', $1, $2, 100, now(), now())
+	`, user1Id, user7Id)
 
 	// Set permissions:
 	// - user 1: implicit all
diff --git a/comms/docker-compose.test.yml b/comms/docker-compose.test.yml
index 8cfe7e1ce6b..695c1f9c7f9 100644
--- a/comms/docker-compose.test.yml
+++ b/comms/docker-compose.test.yml
@@ -2,7 +2,7 @@ version: "3.9"
 services:
 
   postgres:
-    image: postgres
+    image: postgres:15
     environment:
       - POSTGRES_PASSWORD=password
     ports:
diff --git a/packages/discovery-provider/ddl/docker-compose.yml b/packages/discovery-provider/ddl/docker-compose.yml
index 7be428abfb2..dad1a93c224 100644
--- a/packages/discovery-provider/ddl/docker-compose.yml
+++ b/packages/discovery-provider/ddl/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.1'
 
 services:
   db:
-    image: postgres
+    image: postgres:15
     environment:
       POSTGRES_PASSWORD: postgres
     ports:
diff --git a/packages/discovery-provider/ddl/functions/chat_allowed.sql b/packages/discovery-provider/ddl/functions/chat_allowed.sql
index 87cbeae98f9..2164c4f9e5c 100644
--- a/packages/discovery-provider/ddl/functions/chat_allowed.sql
+++ b/packages/discovery-provider/ddl/functions/chat_allowed.sql
@@ -71,7 +71,7 @@ BEGIN
       WHEN 'tippees' THEN
         IF EXISTS (
           SELECT 1
-          FROM aggregate_user_tips tip
+          FROM user_tips tip
           WHERE receiver_user_id = from_user_id
           AND sender_user_id = to_user_id
         ) THEN
@@ -81,7 +81,7 @@ BEGIN
       WHEN 'tippers' THEN
         IF EXISTS (
           SELECT 1
-          FROM aggregate_user_tips tip
+          FROM user_tips tip
           WHERE receiver_user_id = to_user_id
           AND sender_user_id = from_user_id
         ) THEN