diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/CurrentTransaction.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/CurrentTransaction.java
index 7b02d6b1..2e00974a 100644
--- a/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/CurrentTransaction.java
+++ b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/CurrentTransaction.java
@@ -6,10 +6,11 @@ import com.usatiuk.objects.iterators.CloseableKvIterator;
 import com.usatiuk.objects.iterators.IteratorStart;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 import java.util.Optional;
 
-@ApplicationScoped
+@Singleton
 public class CurrentTransaction implements Transaction {
     @Inject
     TransactionManager transactionManager;
diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionManagerImpl.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionManagerImpl.java
index a045dae9..a3aeeaa7 100644
--- a/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionManagerImpl.java
+++ b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionManagerImpl.java
@@ -3,11 +3,12 @@ package com.usatiuk.objects.transaction;
 import io.quarkus.logging.Log;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import org.apache.commons.lang3.tuple.Pair;
 
 import java.util.Collection;
 
-@ApplicationScoped
+@Singleton
 public class TransactionManagerImpl implements TransactionManager {
     private static final ThreadLocal<TransactionPrivate> _currentTransaction = new ThreadLocal<>();
     @Inject
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/DeleterTxHook.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/DeleterTxHook.java
index 232bac69..21d93208 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/DeleterTxHook.java
+++ b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/DeleterTxHook.java
@@ -7,8 +7,9 @@ import com.usatiuk.objects.transaction.Transaction;
 import io.quarkus.logging.Log;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
-@ApplicationScoped
+@Singleton
 public class DeleterTxHook implements PreCommitTxHook {
     @Inject
     Transaction curTx;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/RefcounterTxHook.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/RefcounterTxHook.java
index 4616dcad..8fea7d6f 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/RefcounterTxHook.java
+++ b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/RefcounterTxHook.java
@@ -7,8 +7,9 @@ import com.usatiuk.objects.transaction.Transaction;
 import io.quarkus.logging.Log;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
-@ApplicationScoped
+@Singleton
 public class RefcounterTxHook implements PreCommitTxHook {
     @Inject
     Transaction curTx;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/RemoteObjPusherTxHook.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/RemoteObjPusherTxHook.java
index 44344155..0735949e 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/RemoteObjPusherTxHook.java
+++ b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/RemoteObjPusherTxHook.java
@@ -8,8 +8,9 @@ import com.usatiuk.objects.transaction.PreCommitTxHook;
 import com.usatiuk.objects.transaction.Transaction;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
-@ApplicationScoped
+@Singleton
 public class RemoteObjPusherTxHook implements PreCommitTxHook {
     @Inject
     Transaction curTx;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jmap/JMapHolderRefcounterTxHook.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jmap/JMapHolderRefcounterTxHook.java
index c30c0e81..9b4c6fa5 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jmap/JMapHolderRefcounterTxHook.java
+++ b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jmap/JMapHolderRefcounterTxHook.java
@@ -9,8 +9,9 @@ import com.usatiuk.objects.transaction.PreCommitTxHook;
 import com.usatiuk.objects.transaction.Transaction;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
-@ApplicationScoped
+@Singleton
 public class JMapHolderRefcounterTxHook implements PreCommitTxHook {
     @Inject
     Transaction curTx;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jmap/JMapRefcounterTxHook.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jmap/JMapRefcounterTxHook.java
index 397c0e28..72deab34 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jmap/JMapRefcounterTxHook.java
+++ b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jmap/JMapRefcounterTxHook.java
@@ -9,8 +9,9 @@ import com.usatiuk.objects.transaction.Transaction;
 import io.quarkus.logging.Log;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
-@ApplicationScoped
+@Singleton
 public class JMapRefcounterTxHook implements PreCommitTxHook {
     @Inject
     Transaction curTx;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/AutosyncTxHook.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/AutosyncTxHook.java
index 893b53e3..eb4ef598 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/AutosyncTxHook.java
+++ b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/AutosyncTxHook.java
@@ -8,9 +8,10 @@ import com.usatiuk.objects.transaction.PreCommitTxHook;
 import com.usatiuk.objects.transaction.Transaction;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 
-@ApplicationScoped
+@Singleton
 public class AutosyncTxHook implements PreCommitTxHook {
     @Inject
     Transaction curTx;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peertrust/PeerInfoCertUpdateTxHook.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peertrust/PeerInfoCertUpdateTxHook.java
index 84815791..5f34c54e 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peertrust/PeerInfoCertUpdateTxHook.java
+++ b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peertrust/PeerInfoCertUpdateTxHook.java
@@ -14,8 +14,9 @@ import com.usatiuk.objects.transaction.Transaction;
 import io.quarkus.logging.Log;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
-@ApplicationScoped
+@Singleton
 public class PeerInfoCertUpdateTxHook implements PreCommitTxHook {
     @Inject
     Transaction curTx;