diff --git a/dlt-connector/src/client/GradidoNode/GradidoNodeProcess.ts b/dlt-connector/src/client/GradidoNode/GradidoNodeProcess.ts
index a98db7d71..09c9b13ab 100644
--- a/dlt-connector/src/client/GradidoNode/GradidoNodeProcess.ts
+++ b/dlt-connector/src/client/GradidoNode/GradidoNodeProcess.ts
@@ -48,7 +48,7 @@ export class GradidoNodeProcess {
     const isWindows = process.platform === 'win32'
     const binaryName = isWindows ? 'GradidoNode.exe' : 'GradidoNode'
 
-    return path.join(__dirname, CONFIG.DLT_GRADIDO_NODE_SERVER_HOME_FOLDER, 'bin', binaryName)
+    return path.join(CONFIG.DLT_GRADIDO_NODE_SERVER_HOME_FOLDER, 'bin', binaryName)
   }
 
   public start() {
diff --git a/dlt-connector/src/interactions/sendToHiero/CommunityRootTransaction.role.ts b/dlt-connector/src/interactions/sendToHiero/CommunityRootTransaction.role.ts
index 4898098f6..1c7cc1fce 100644
--- a/dlt-connector/src/interactions/sendToHiero/CommunityRootTransaction.role.ts
+++ b/dlt-connector/src/interactions/sendToHiero/CommunityRootTransaction.role.ts
@@ -50,6 +50,7 @@ export class CommunityRootTransactionRole extends AbstractTransactionRole {
     }
     builder
       .setCreatedAt(this.community.creationDate)
+      .setSenderCommunity(this.community.uuid)
       .setCommunityRoot(
         communityKeyPair.getPublicKey(),
         gmwKeyPair.getPublicKey(),
diff --git a/dlt-connector/src/interactions/sendToHiero/CreationTransaction.role.ts b/dlt-connector/src/interactions/sendToHiero/CreationTransaction.role.ts
index 9bd7a7e8c..25f55f145 100644
--- a/dlt-connector/src/interactions/sendToHiero/CreationTransaction.role.ts
+++ b/dlt-connector/src/interactions/sendToHiero/CreationTransaction.role.ts
@@ -65,6 +65,7 @@ export class CreationTransactionRole extends AbstractTransactionRole {
           new AuthenticatedEncryption(recipientKeyPair),
         ),
       )
+      .setRecipientCommunity(this.creationTransaction.user.communityId)
       .setTransactionCreation(
         new TransferAmount(
           recipientKeyPair.getPublicKey(),
diff --git a/dlt-connector/src/interactions/sendToHiero/DeferredTransferTransaction.role.ts b/dlt-connector/src/interactions/sendToHiero/DeferredTransferTransaction.role.ts
index 3ac72c0ad..4cad8f0b8 100644
--- a/dlt-connector/src/interactions/sendToHiero/DeferredTransferTransaction.role.ts
+++ b/dlt-connector/src/interactions/sendToHiero/DeferredTransferTransaction.role.ts
@@ -55,6 +55,7 @@ export class DeferredTransferTransactionRole extends AbstractTransactionRole {
           new AuthenticatedEncryption(recipientKeyPair),
         ),
       )
+      .setSenderCommunity(this.deferredTransferTransaction.user.communityId)
       .setDeferredTransfer(
         new GradidoTransfer(
           new TransferAmount(
diff --git a/dlt-connector/src/interactions/sendToHiero/RedeemDeferredTransferTransaction.role.ts b/dlt-connector/src/interactions/sendToHiero/RedeemDeferredTransferTransaction.role.ts
index 0c0a3c64e..5053e0211 100644
--- a/dlt-connector/src/interactions/sendToHiero/RedeemDeferredTransferTransaction.role.ts
+++ b/dlt-connector/src/interactions/sendToHiero/RedeemDeferredTransferTransaction.role.ts
@@ -59,6 +59,8 @@ export class RedeemDeferredTransferTransactionRole extends AbstractTransactionRo
 
     builder
       .setCreatedAt(this.redeemDeferredTransferTransaction.createdAt)
+      .setSenderCommunity(this.redeemDeferredTransferTransaction.user.communityId)
+      .setRecipientCommunity(this.linkedUser.communityId)
       .setRedeemDeferredTransfer(
         this.parentDeferredTransaction.getId(),
         new GradidoTransfer(
@@ -74,12 +76,6 @@ export class RedeemDeferredTransferTransactionRole extends AbstractTransactionRo
     for (let i = 0; i < memos.size(); i++) {
       builder.addMemo(memos.get(i))
     }
-    const senderCommunity = this.redeemDeferredTransferTransaction.user.communityTopicId
-    const recipientCommunity = this.linkedUser.communityTopicId
-    if (senderCommunity !== recipientCommunity) {
-      // we have a cross group transaction
-      builder.setSenderCommunity(senderCommunity).setRecipientCommunity(recipientCommunity)
-    }
     builder.sign(senderKeyPair)
     return builder
   }
diff --git a/dlt-connector/src/interactions/sendToHiero/RegisterAddressTransaction.role.ts b/dlt-connector/src/interactions/sendToHiero/RegisterAddressTransaction.role.ts
index 7344c9a59..b85b6482d 100644
--- a/dlt-connector/src/interactions/sendToHiero/RegisterAddressTransaction.role.ts
+++ b/dlt-connector/src/interactions/sendToHiero/RegisterAddressTransaction.role.ts
@@ -50,6 +50,7 @@ export class RegisterAddressTransactionRole extends AbstractTransactionRole {
 
     builder
       .setCreatedAt(this.registerAddressTransaction.createdAt)
+      .setSenderCommunity(this.registerAddressTransaction.user.communityId)
       .setRegisterAddress(
         userKeyPair.getPublicKey(),
         this.registerAddressTransaction.accountType as AddressType,
diff --git a/dlt-connector/src/interactions/sendToHiero/TransferTransaction.role.ts b/dlt-connector/src/interactions/sendToHiero/TransferTransaction.role.ts
index fe9258d74..eb2d19972 100644
--- a/dlt-connector/src/interactions/sendToHiero/TransferTransaction.role.ts
+++ b/dlt-connector/src/interactions/sendToHiero/TransferTransaction.role.ts
@@ -40,7 +40,6 @@ export class TransferTransactionRole extends AbstractTransactionRole {
     const recipientKeyPair = await ResolveKeyPair(
       new KeyPairIdentifierLogic(this.transferTransaction.linkedUser),
     )
-
     builder
       .setCreatedAt(this.transferTransaction.createdAt)
       .addMemo(
@@ -50,6 +49,8 @@ export class TransferTransactionRole extends AbstractTransactionRole {
           new AuthenticatedEncryption(recipientKeyPair),
         ),
       )
+      .setSenderCommunity(this.transferTransaction.user.communityId)
+      .setRecipientCommunity(this.transferTransaction.linkedUser.communityId)
       .setTransactionTransfer(
         new TransferAmount(
           senderKeyPair.getPublicKey(),
@@ -58,12 +59,6 @@ export class TransferTransactionRole extends AbstractTransactionRole {
         ),
         recipientKeyPair.getPublicKey(),
       )
-    const senderCommunity = this.transferTransaction.user.communityTopicId
-    const recipientCommunity = this.transferTransaction.linkedUser.communityTopicId
-    if (senderCommunity !== recipientCommunity) {
-      // we have a cross group transaction
-      builder.setSenderCommunity(senderCommunity).setRecipientCommunity(recipientCommunity)
-    }
     builder.sign(senderKeyPair)
     return builder
   }