diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/AbstractPhaseRepository.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/AbstractPhaseRepository.java
index ed48d3939db30df911f749eaad17a41bc9b5403a..b3613abbebfdfe90c156ea7f0e36178668fef5d7 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/AbstractPhaseRepository.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/AbstractPhaseRepository.java
@@ -5,9 +5,11 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
+@Repository
 public interface AbstractPhaseRepository extends JpaRepository<AbstractPhase, Long> {
 
     List<AbstractPhase> findAllByTrainingDefinitionIdOrderByOrder(long trainingDefinitionId);
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/InfoPhaseRepository.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/InfoPhaseRepository.java
index 37ab685feef52764aa1e33a777886ede431e6d72..bafec1c8f685565b1f6461b512551c42e49f99ea 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/InfoPhaseRepository.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/InfoPhaseRepository.java
@@ -2,6 +2,8 @@ package cz.muni.ics.kypo.training.adaptive.repository;
 
 import cz.muni.ics.kypo.training.adaptive.domain.InfoPhase;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
 
+@Repository
 public interface InfoPhaseRepository extends JpaRepository<InfoPhase, Long> {
 }
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/QuestionPhaseRelationRepository.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/QuestionPhaseRelationRepository.java
index c5f3cf6a7a12d5181a4a2e264859c2c7eeec4af6..a79d1229070bca9ac526af0b62e2af5476bdd917 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/QuestionPhaseRelationRepository.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/QuestionPhaseRelationRepository.java
@@ -2,6 +2,8 @@ package cz.muni.ics.kypo.training.adaptive.repository;
 
 import cz.muni.ics.kypo.training.adaptive.domain.QuestionPhaseRelation;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
 
+@Repository
 public interface QuestionPhaseRelationRepository extends JpaRepository<QuestionPhaseRelation, Long> {
 }
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/QuestionRepository.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/QuestionRepository.java
index 9261b373f4e1dd00b914d72ac18f8fa3552a6da6..f20e7080473e2ebcca5bfc68f8714ec557b1bc4f 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/QuestionRepository.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/QuestionRepository.java
@@ -2,6 +2,8 @@ package cz.muni.ics.kypo.training.adaptive.repository;
 
 import cz.muni.ics.kypo.training.adaptive.domain.Question;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
 
+@Repository
 public interface QuestionRepository extends JpaRepository<Question, Long> {
 }
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/QuestionnairePhaseRepository.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/QuestionnairePhaseRepository.java
index 26cf52a45159c455afeeb873ef71635a777a6924..9a0362d4804a117142e94a044de8288a3b168e28 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/QuestionnairePhaseRepository.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/QuestionnairePhaseRepository.java
@@ -2,6 +2,8 @@ package cz.muni.ics.kypo.training.adaptive.repository;
 
 import cz.muni.ics.kypo.training.adaptive.domain.QuestionnairePhase;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
 
+@Repository
 public interface QuestionnairePhaseRepository extends JpaRepository<QuestionnairePhase, Long> {
 }
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/TaskRepository.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/TaskRepository.java
index 25d9484e2b3747d58eb72499e532424230ff521d..a5bf4e245e944bef02c83be0d7a3cfbf2f6f2f7a 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/TaskRepository.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/TaskRepository.java
@@ -5,8 +5,9 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.stereotype.Repository;
 
+@Repository
 public interface TaskRepository extends JpaRepository<Task, Long> {
 
     @Query("SELECT COALESCE(MAX(g.order), -1) FROM Task g WHERE g.trainingPhase.id = :phaseId")
@@ -18,8 +19,8 @@ public interface TaskRepository extends JpaRepository<Task, Long> {
             "AND t.order > :lowerBound " +
             "AND t.order <= :upperBound ")
     void decreaseOrderOfTasksOnInterval(@Param("trainingPhaseId") Long trainingPhaseId,
-                                         @Param("lowerBound") int lowerBound,
-                                         @Param("upperBound") int upperBound);
+                                        @Param("lowerBound") int lowerBound,
+                                        @Param("upperBound") int upperBound);
 
 
     @Modifying
@@ -28,11 +29,9 @@ public interface TaskRepository extends JpaRepository<Task, Long> {
             "AND t.order >= :lowerBound " +
             "AND t.order < :upperBound ")
     void increaseOrderOfTasksOnInterval(@Param("trainingPhaseId") Long trainingPhaseId,
-                                         @Param("lowerBound") int lowerBound,
-                                         @Param("upperBound") int upperBound);
+                                        @Param("lowerBound") int lowerBound,
+                                        @Param("upperBound") int upperBound);
 
-
-    @Transactional
     @Modifying
     @Query("UPDATE Task t SET t.order = t.order - 1 " +
             "WHERE t.trainingPhase.id = :trainingPhaseId " +
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/TrainingPhaseRepository.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/TrainingPhaseRepository.java
index 50903da8ee37a6694e77fbc06c8b6cd86281e021..d09677540354b053fb632cd42e9b8bf3cf8d0a57 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/TrainingPhaseRepository.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/TrainingPhaseRepository.java
@@ -4,9 +4,11 @@ import cz.muni.ics.kypo.training.adaptive.domain.TrainingPhase;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
+@Repository
 public interface TrainingPhaseRepository extends JpaRepository<TrainingPhase, Long> {
 
     @Query("SELECT COUNT(p.id) FROM TrainingPhase p WHERE p.trainingDefinitionId = :trainingDefinitionId")
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/service/TaskService.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/TaskService.java
index 69cf07d99c161e9ab67d4d77920adf32932bfd75..42f47ec9a82103d8b3d0851f4fc6a460d34e98b5 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/service/TaskService.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/TaskService.java
@@ -99,6 +99,7 @@ public class TaskService {
         return BeanMapper.INSTANCE.toDto(savedEntity);
     }
 
+    @Transactional
     public void removeTask(Long trainingDefinitionId, Long phaseId, Long taskId) {
         Task task = taskRepository.findById(taskId)
                 .orElseThrow(() -> new RuntimeException("Task was not found"));