diff --git a/package.yaml b/package.yaml
index 7d8af47401..dbc75ddf9f 100644
--- a/package.yaml
+++ b/package.yaml
@@ -104,16 +104,20 @@ executables:
       - -threaded
 
   simplex-broadcast-bot:
-    source-dirs: apps/simplex-broadcast-bot/src
-    main: ../Main.hs
+    source-dirs:
+      - apps/simplex-broadcast-bot
+      - apps/simplex-broadcast-bot/src
+    main: Main.hs
     dependencies:
       - simplex-chat
     ghc-options:
       - -threaded
 
   simplex-directory-service:
-    source-dirs: apps/simplex-directory-service/src
-    main: ../Main.hs
+    source-dirs:
+      - apps/simplex-directory-service
+      - apps/simplex-directory-service/src
+    main: Main.hs
     dependencies:
       - simplex-chat
     ghc-options:
diff --git a/simplex-chat.cabal b/simplex-chat.cabal
index 9caa46da55..c9c7012102 100644
--- a/simplex-chat.cabal
+++ b/simplex-chat.cabal
@@ -355,13 +355,14 @@ executable simplex-bot-advanced
       , text >=1.2.3.0 && <1.3
 
 executable simplex-broadcast-bot
-  main-is: ../Main.hs
+  main-is: Main.hs
+  hs-source-dirs:
+      apps/simplex-broadcast-bot
+      apps/simplex-broadcast-bot/src
   other-modules:
       Broadcast.Bot
       Broadcast.Options
       Paths_simplex_chat
-  hs-source-dirs:
-      apps/simplex-broadcast-bot/src
   ghc-options: -Wall -Wcompat -Werror=incomplete-patterns -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns -Wunused-type-patterns -threaded
   build-depends:
       aeson ==2.2.*
@@ -481,7 +482,10 @@ executable simplex-chat
       , text >=1.2.3.0 && <1.3
 
 executable simplex-directory-service
-  main-is: ../Main.hs
+  main-is: Main.hs
+  hs-source-dirs:
+      apps/simplex-directory-service
+      apps/simplex-directory-service/src
   other-modules:
       Directory.Events
       Directory.Options
@@ -489,8 +493,6 @@ executable simplex-directory-service
       Directory.Service
       Directory.Store
       Paths_simplex_chat
-  hs-source-dirs:
-      apps/simplex-directory-service/src
   ghc-options: -Wall -Wcompat -Werror=incomplete-patterns -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns -Wunused-type-patterns -threaded
   build-depends:
       aeson ==2.2.*