diff --git a/lib/screens/app_detail_screen.dart b/lib/screens/app_detail_screen.dart
index 77a340d..7c8e37f 100644
--- a/lib/screens/app_detail_screen.dart
+++ b/lib/screens/app_detail_screen.dart
@@ -662,7 +662,7 @@ class _AppDetailContent extends HookConsumerWidget {
       await ref.storage.save({signedStack});
       ref.storage.publish({
         signedStack,
-      }, source: RemoteSource(relays: 'social'));
+      }, relays: {'social', 'AppCatalog'});
 
       if (context.mounted) {
         context.showInfo(
diff --git a/lib/screens/app_stacks_screen.dart b/lib/screens/app_stacks_screen.dart
index beeea3e..8d19da1 100644
--- a/lib/screens/app_stacks_screen.dart
+++ b/lib/screens/app_stacks_screen.dart
@@ -511,7 +511,7 @@ class _MigrationBanner extends HookConsumerWidget {
         await ref.storage.save({signedStack});
         ref.storage.publish({
           signedStack,
-        }, source: RemoteSource(relays: {'social', 'AppCatalog'}));
+        }, relays: {'social', 'AppCatalog'});
 
         progressCount.value++;
       }
diff --git a/lib/widgets/app_detail_widgets.dart b/lib/widgets/app_detail_widgets.dart
index ff0d62f..7767b3c 100644
--- a/lib/widgets/app_detail_widgets.dart
+++ b/lib/widgets/app_detail_widgets.dart
@@ -274,7 +274,7 @@ class SocialActionsRow extends HookConsumerWidget {
       await ref.storage.save({signedStack});
       ref.storage.publish({
         signedStack,
-      }, source: RemoteSource(relays: 'social'));
+      }, relays: {'social', 'AppCatalog'});
 
       if (context.mounted) {
         context.showInfo(
diff --git a/lib/widgets/bookmark_widgets.dart b/lib/widgets/bookmark_widgets.dart
index 425d066..bcaf8d4 100644
--- a/lib/widgets/bookmark_widgets.dart
+++ b/lib/widgets/bookmark_widgets.dart
@@ -167,7 +167,7 @@ class SaveAppDialog extends HookConsumerWidget {
       await ref.storage.save({signedStack});
       ref.storage.publish({
         signedStack,
-      }, source: RemoteSource(relays: 'social'));
+      }, relays: {'social', 'AppCatalog'});
 
       if (context.mounted) {
         Navigator.pop(context);
@@ -652,7 +652,7 @@ class _AddToStackDialogSignedIn extends HookConsumerWidget {
           await ref.storage.save({signedStack});
           await ref.storage.publish({
             signedStack,
-          }, source: RemoteSource(relays: {'social', 'AppCatalog'}));
+          }, relays: {'social', 'AppCatalog'});
         }
       }
 
@@ -684,7 +684,7 @@ class _AddToStackDialogSignedIn extends HookConsumerWidget {
           await ref.storage.save({signedStack});
           await ref.storage.publish({
             signedStack,
-          }, source: RemoteSource(relays: {'social', 'AppCatalog'}));
+          }, relays: {'social', 'AppCatalog'});
         }
       }
 
diff --git a/lib/widgets/comments_section.dart b/lib/widgets/comments_section.dart
index 48599fb..b60862b 100644
--- a/lib/widgets/comments_section.dart
+++ b/lib/widgets/comments_section.dart
@@ -677,7 +677,7 @@ class _CommentComposer extends HookConsumerWidget {
       final signedComment = await comment.signWith(signer);
 
       await signedComment.save();
-      await signedComment.publish(source: RemoteSource(relays: 'social'));
+      await signedComment.publish(relays: {'social', 'AppCatalog'});
 
       if (context.mounted) {
         Navigator.pop(context);
@@ -890,7 +890,7 @@ class _ReplyComposer extends HookConsumerWidget {
       final signedReply = await reply.signWith(signer);
 
       await signedReply.save();
-      await signedReply.publish(source: RemoteSource(relays: 'social'));
+      await signedReply.publish(relays: {'social', 'AppCatalog'});
 
       if (context.mounted) {
         Navigator.pop(context);
@@ -1020,7 +1020,7 @@ class _StackCommentComposer extends HookConsumerWidget {
       final signedComment = await comment.signWith(signer);
 
       await signedComment.save();
-      await signedComment.publish(source: RemoteSource(relays: 'social'));
+      await signedComment.publish(relays: {'social', 'AppCatalog'});
 
       if (context.mounted) {
         Navigator.pop(context);
diff --git a/lib/widgets/relevant_who_follow_container.dart b/lib/widgets/relevant_who_follow_container.dart
index 1e48437..bec8108 100644
--- a/lib/widgets/relevant_who_follow_container.dart
+++ b/lib/widgets/relevant_who_follow_container.dart
@@ -385,7 +385,7 @@ Future<Model<dynamic>?> _runDVMRequest(
 
     await ref.read(storageNotifierProvider.notifier).publish(
       {request},
-      source: source,
+      relays: relays,
     );
 
     return await completer.future.timeout(timeout);
diff --git a/lib/widgets/zap_widgets.dart b/lib/widgets/zap_widgets.dart
index 856fa76..d83637d 100644
--- a/lib/widgets/zap_widgets.dart
+++ b/lib/widgets/zap_widgets.dart
@@ -445,6 +445,8 @@ class ZapAmountDialog extends HookConsumerWidget {
 
                         final socialRelays = await storageNotifier
                             .resolveRelays('social');
+                        final appCatalogRelays = await storageNotifier
+                            .resolveRelays('AppCatalog');
 
                         final zapRequest = PartialZapRequest();
                         zapRequest.amount = amount * 1000; // msats
@@ -452,7 +454,7 @@ class ZapAmountDialog extends HookConsumerWidget {
                         zapRequest.linkProfileByPubkey(author.pubkey);
                         zapRequest.linkModel(app);
                         zapRequest.linkModelById(latestMetadata.id);
-                        zapRequest.relays = socialRelays;
+                        zapRequest.relays = {...socialRelays, ...appCatalogRelays};
 
                         final signedZapRequest = await zapRequest.signWith(
                           signer,