diff --git a/src/main/java/tech/ailef/dbadmin/external/DbAdminAutoConfiguration.java b/src/main/java/tech/ailef/dbadmin/external/DbAdminAutoConfiguration.java
index 92d2170..1b308b3 100644
--- a/src/main/java/tech/ailef/dbadmin/external/DbAdminAutoConfiguration.java
+++ b/src/main/java/tech/ailef/dbadmin/external/DbAdminAutoConfiguration.java
@@ -16,7 +16,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-
 package tech.ailef.dbadmin.external;
 
 import java.util.Properties;
@@ -37,6 +36,7 @@ import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
 import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import tech.ailef.dbadmin.internal.InternalDbAdminConfiguration;
 
@@ -52,7 +52,6 @@ import tech.ailef.dbadmin.internal.InternalDbAdminConfiguration;
 @Configuration
 @EnableJpaRepositories(
 	entityManagerFactoryRef = "internalEntityManagerFactory", 
-	transactionManagerRef = "internalTransactionManager", 
 	basePackages = { "tech.ailef.dbadmin.internal.repository" }
 )
 @EnableTransactionManagement
@@ -67,7 +66,7 @@ public class DbAdminAutoConfiguration {
 	 * @return
 	 */
 	@Bean
-	public DataSource internalDataSource() {
+	DataSource internalDataSource() {
 		DataSourceBuilder<?> dataSourceBuilder = DataSourceBuilder.create();
 		dataSourceBuilder.driverClassName("org.h2.Driver");
 		if (props.isTestMode()) {
@@ -82,7 +81,7 @@ public class DbAdminAutoConfiguration {
 	}
 
 	@Bean
-	public LocalContainerEntityManagerFactoryBean internalEntityManagerFactory() {
+	LocalContainerEntityManagerFactoryBean internalEntityManagerFactory() {
 		LocalContainerEntityManagerFactoryBean factoryBean = new LocalContainerEntityManagerFactoryBean();
 		factoryBean.setDataSource(internalDataSource());
 		factoryBean.setPersistenceUnitName("internal");
@@ -96,11 +95,23 @@ public class DbAdminAutoConfiguration {
 		return factoryBean;
 	}
 
-	@Bean
-	public PlatformTransactionManager internalTransactionManager() {
+	/**
+	 * The internal transaction manager. It is not defined as a bean
+	 * in order to avoid "colliding" with the default transactionManager
+	 * registered by the user. Internally, we use this to instantiate a
+	 * TransactionTemplate and run all transactions manually instead of
+	 * relying on the @link {@link Transactional} annotation.
+	 * @return
+	 */
+	PlatformTransactionManager internalTransactionManager() {
 		JpaTransactionManager transactionManager = new JpaTransactionManager();
 		transactionManager.setEntityManagerFactory(internalEntityManagerFactory().getObject());
 		return transactionManager;
 	}
+	
+	@Bean
+	TransactionTemplate internalTransactionTemplate() {
+	    return new TransactionTemplate(internalTransactionManager());
+	}
 
 }
\ No newline at end of file
diff --git a/src/main/java/tech/ailef/dbadmin/external/dbmapping/fields/DbField.java b/src/main/java/tech/ailef/dbadmin/external/dbmapping/fields/DbField.java
index d503155..7943501 100644
--- a/src/main/java/tech/ailef/dbadmin/external/dbmapping/fields/DbField.java
+++ b/src/main/java/tech/ailef/dbadmin/external/dbmapping/fields/DbField.java
@@ -281,7 +281,5 @@ public class DbField {
 		DbField other = (DbField) obj;
 		return Objects.equals(dbName, other.dbName) && type == other.type;
 	}
-
-	
-
 }
+
diff --git a/src/main/java/tech/ailef/dbadmin/internal/service/UserActionService.java b/src/main/java/tech/ailef/dbadmin/internal/service/UserActionService.java
index 312d34a..dcab0aa 100644
--- a/src/main/java/tech/ailef/dbadmin/internal/service/UserActionService.java
+++ b/src/main/java/tech/ailef/dbadmin/internal/service/UserActionService.java
@@ -24,7 +24,7 @@ import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import tech.ailef.dbadmin.external.dto.LogsSearchRequest;
 import tech.ailef.dbadmin.external.dto.PaginatedResult;
@@ -45,9 +45,13 @@ public class UserActionService {
 	@Autowired
 	private CustomActionRepositoryImpl customRepo;
 	
-	@Transactional("internalTransactionManager")
+	@Autowired
+	private TransactionTemplate internalTransactionTemplate;
+	
 	public UserAction save(UserAction a) {
-		return repo.save(a);
+		return internalTransactionTemplate.execute(status -> {
+			return repo.save(a);
+		});
 	}
 	
 	/**