diff --git a/2022-02/spring-15-mvc/spring-mvc-demo/pom.xml b/2022-02/spring-15-mvc/spring-mvc-demo/pom.xml
index 5c6fffca..770edaca 100644
--- a/2022-02/spring-15-mvc/spring-mvc-demo/pom.xml
+++ b/2022-02/spring-15-mvc/spring-mvc-demo/pom.xml
@@ -11,21 +11,15 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.6.2</version>
+        <version>2.6.7</version>
         <relativePath/>
     </parent>
 
     <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <java.version>11</java.version>
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
@@ -33,12 +27,13 @@
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-keyvalue</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 
diff --git a/2022-02/spring-15-mvc/spring-mvc-demo/src/main/java/ru/otus/spring/Main.java b/2022-02/spring-15-mvc/spring-mvc-demo/src/main/java/ru/otus/spring/Main.java
index c8a54bea..7d9d2703 100644
--- a/2022-02/spring-15-mvc/spring-mvc-demo/src/main/java/ru/otus/spring/Main.java
+++ b/2022-02/spring-15-mvc/spring-mvc-demo/src/main/java/ru/otus/spring/Main.java
@@ -9,7 +9,6 @@ import ru.otus.spring.repostory.PersonRepository;
 
 import javax.annotation.PostConstruct;
 
-@EnableMapRepositories
 @SpringBootApplication
 public class Main {
 
diff --git a/2022-02/spring-15-mvc/spring-mvc-demo/src/main/java/ru/otus/spring/domain/Person.java b/2022-02/spring-15-mvc/spring-mvc-demo/src/main/java/ru/otus/spring/domain/Person.java
index 4fea35dc..3a4c40b3 100644
--- a/2022-02/spring-15-mvc/spring-mvc-demo/src/main/java/ru/otus/spring/domain/Person.java
+++ b/2022-02/spring-15-mvc/spring-mvc-demo/src/main/java/ru/otus/spring/domain/Person.java
@@ -1,15 +1,18 @@
 package ru.otus.spring.domain;
 
-import org.springframework.data.annotation.Id;
-import org.springframework.data.keyvalue.annotation.KeySpace;
+import javax.persistence.Entity;
+import javax.persistence.Id;
 
-@KeySpace("person")
+@Entity
 public class Person {
 
     @Id
     private long id;
     private String name;
 
+    public Person() {
+    }
+
     public Person(String name) {
         this.name = name;
     }
diff --git a/2022-02/spring-15-mvc/spring-mvc-exercise/pom.xml b/2022-02/spring-15-mvc/spring-mvc-exercise/pom.xml
index 4e69c8f3..c7a0302e 100644
--- a/2022-02/spring-15-mvc/spring-mvc-exercise/pom.xml
+++ b/2022-02/spring-15-mvc/spring-mvc-exercise/pom.xml
@@ -11,22 +11,15 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.6.2</version>
+        <version>2.6.7</version>
         <relativePath/>
     </parent>
 
     <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <java.version>11</java.version>
     </properties>
 
-
     <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
@@ -34,16 +27,15 @@
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
 
-
         <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-keyvalue</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
         </dependency>
     </dependencies>
-
     <build>
         <plugins>
             <plugin>
diff --git a/2022-02/spring-15-mvc/spring-mvc-exercise/src/main/java/ru/otus/spring/Main.java b/2022-02/spring-15-mvc/spring-mvc-exercise/src/main/java/ru/otus/spring/Main.java
index c8a54bea..e73a469d 100644
--- a/2022-02/spring-15-mvc/spring-mvc-exercise/src/main/java/ru/otus/spring/Main.java
+++ b/2022-02/spring-15-mvc/spring-mvc-exercise/src/main/java/ru/otus/spring/Main.java
@@ -3,13 +3,11 @@ package ru.otus.spring;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.data.map.repository.config.EnableMapRepositories;
 import ru.otus.spring.domain.Person;
 import ru.otus.spring.repostory.PersonRepository;
 
 import javax.annotation.PostConstruct;
 
-@EnableMapRepositories
 @SpringBootApplication
 public class Main {
 
diff --git a/2022-02/spring-15-mvc/spring-mvc-exercise/src/main/java/ru/otus/spring/domain/Person.java b/2022-02/spring-15-mvc/spring-mvc-exercise/src/main/java/ru/otus/spring/domain/Person.java
index 4fea35dc..3a4c40b3 100644
--- a/2022-02/spring-15-mvc/spring-mvc-exercise/src/main/java/ru/otus/spring/domain/Person.java
+++ b/2022-02/spring-15-mvc/spring-mvc-exercise/src/main/java/ru/otus/spring/domain/Person.java
@@ -1,15 +1,18 @@
 package ru.otus.spring.domain;
 
-import org.springframework.data.annotation.Id;
-import org.springframework.data.keyvalue.annotation.KeySpace;
+import javax.persistence.Entity;
+import javax.persistence.Id;
 
-@KeySpace("person")
+@Entity
 public class Person {
 
     @Id
     private long id;
     private String name;
 
+    public Person() {
+    }
+
     public Person(String name) {
         this.name = name;
     }
diff --git a/2022-02/spring-15-mvc/spring-mvc-solution-1/pom.xml b/2022-02/spring-15-mvc/spring-mvc-solution-1/pom.xml
index ab9712b3..c04911c0 100644
--- a/2022-02/spring-15-mvc/spring-mvc-solution-1/pom.xml
+++ b/2022-02/spring-15-mvc/spring-mvc-solution-1/pom.xml
@@ -11,21 +11,15 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.6.2</version>
+        <version>2.6.7</version>
         <relativePath/>
     </parent>
 
     <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <java.version>11</java.version>
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
@@ -33,15 +27,15 @@
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-keyvalue</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
         </dependency>
     </dependencies>
-
     <build>
         <plugins>
             <plugin>
diff --git a/2022-02/spring-15-mvc/spring-mvc-solution-1/src/main/java/ru/otus/spring/Main.java b/2022-02/spring-15-mvc/spring-mvc-solution-1/src/main/java/ru/otus/spring/Main.java
index c8a54bea..e73a469d 100644
--- a/2022-02/spring-15-mvc/spring-mvc-solution-1/src/main/java/ru/otus/spring/Main.java
+++ b/2022-02/spring-15-mvc/spring-mvc-solution-1/src/main/java/ru/otus/spring/Main.java
@@ -3,13 +3,11 @@ package ru.otus.spring;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.data.map.repository.config.EnableMapRepositories;
 import ru.otus.spring.domain.Person;
 import ru.otus.spring.repostory.PersonRepository;
 
 import javax.annotation.PostConstruct;
 
-@EnableMapRepositories
 @SpringBootApplication
 public class Main {
 
diff --git a/2022-02/spring-15-mvc/spring-mvc-solution-1/src/main/java/ru/otus/spring/domain/Person.java b/2022-02/spring-15-mvc/spring-mvc-solution-1/src/main/java/ru/otus/spring/domain/Person.java
index 4fea35dc..3a4c40b3 100644
--- a/2022-02/spring-15-mvc/spring-mvc-solution-1/src/main/java/ru/otus/spring/domain/Person.java
+++ b/2022-02/spring-15-mvc/spring-mvc-solution-1/src/main/java/ru/otus/spring/domain/Person.java
@@ -1,15 +1,18 @@
 package ru.otus.spring.domain;
 
-import org.springframework.data.annotation.Id;
-import org.springframework.data.keyvalue.annotation.KeySpace;
+import javax.persistence.Entity;
+import javax.persistence.Id;
 
-@KeySpace("person")
+@Entity
 public class Person {
 
     @Id
     private long id;
     private String name;
 
+    public Person() {
+    }
+
     public Person(String name) {
         this.name = name;
     }
diff --git a/2022-02/spring-15-mvc/spring-mvc-solution-2/pom.xml b/2022-02/spring-15-mvc/spring-mvc-solution-2/pom.xml
index 10ca0b1d..610320ae 100644
--- a/2022-02/spring-15-mvc/spring-mvc-solution-2/pom.xml
+++ b/2022-02/spring-15-mvc/spring-mvc-solution-2/pom.xml
@@ -11,21 +11,15 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.6.2</version>
+        <version>2.6.7</version>
         <relativePath/>
     </parent>
 
     <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <java.version>11</java.version>
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
@@ -33,13 +27,13 @@
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
 
-
         <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-keyvalue</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 
diff --git a/2022-02/spring-15-mvc/spring-mvc-solution-2/src/main/java/ru/otus/spring/Main.java b/2022-02/spring-15-mvc/spring-mvc-solution-2/src/main/java/ru/otus/spring/Main.java
index c8a54bea..e73a469d 100644
--- a/2022-02/spring-15-mvc/spring-mvc-solution-2/src/main/java/ru/otus/spring/Main.java
+++ b/2022-02/spring-15-mvc/spring-mvc-solution-2/src/main/java/ru/otus/spring/Main.java
@@ -3,13 +3,11 @@ package ru.otus.spring;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.data.map.repository.config.EnableMapRepositories;
 import ru.otus.spring.domain.Person;
 import ru.otus.spring.repostory.PersonRepository;
 
 import javax.annotation.PostConstruct;
 
-@EnableMapRepositories
 @SpringBootApplication
 public class Main {
 
diff --git a/2022-02/spring-15-mvc/spring-mvc-solution-2/src/main/java/ru/otus/spring/domain/Person.java b/2022-02/spring-15-mvc/spring-mvc-solution-2/src/main/java/ru/otus/spring/domain/Person.java
index 4fea35dc..3a4c40b3 100644
--- a/2022-02/spring-15-mvc/spring-mvc-solution-2/src/main/java/ru/otus/spring/domain/Person.java
+++ b/2022-02/spring-15-mvc/spring-mvc-solution-2/src/main/java/ru/otus/spring/domain/Person.java
@@ -1,15 +1,18 @@
 package ru.otus.spring.domain;
 
-import org.springframework.data.annotation.Id;
-import org.springframework.data.keyvalue.annotation.KeySpace;
+import javax.persistence.Entity;
+import javax.persistence.Id;
 
-@KeySpace("person")
+@Entity
 public class Person {
 
     @Id
     private long id;
     private String name;
 
+    public Person() {
+    }
+
     public Person(String name) {
         this.name = name;
     }
diff --git a/2022-02/spring-15-mvc/spring-mvc-solution-3/pom.xml b/2022-02/spring-15-mvc/spring-mvc-solution-3/pom.xml
index 48ae1149..d1aa1df4 100644
--- a/2022-02/spring-15-mvc/spring-mvc-solution-3/pom.xml
+++ b/2022-02/spring-15-mvc/spring-mvc-solution-3/pom.xml
@@ -11,21 +11,15 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.6.2</version>
+        <version>2.6.7</version>
         <relativePath/>
     </parent>
 
     <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <java.version>11</java.version>
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
@@ -33,16 +27,15 @@
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
 
-
         <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-keyvalue</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
         </dependency>
     </dependencies>
-
     <build>
         <plugins>
             <plugin>
diff --git a/2022-02/spring-15-mvc/spring-mvc-solution-3/src/main/java/ru/otus/spring/Main.java b/2022-02/spring-15-mvc/spring-mvc-solution-3/src/main/java/ru/otus/spring/Main.java
index c8a54bea..e73a469d 100644
--- a/2022-02/spring-15-mvc/spring-mvc-solution-3/src/main/java/ru/otus/spring/Main.java
+++ b/2022-02/spring-15-mvc/spring-mvc-solution-3/src/main/java/ru/otus/spring/Main.java
@@ -3,13 +3,11 @@ package ru.otus.spring;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.data.map.repository.config.EnableMapRepositories;
 import ru.otus.spring.domain.Person;
 import ru.otus.spring.repostory.PersonRepository;
 
 import javax.annotation.PostConstruct;
 
-@EnableMapRepositories
 @SpringBootApplication
 public class Main {
 
diff --git a/2022-02/spring-15-mvc/spring-mvc-solution-3/src/main/java/ru/otus/spring/domain/Person.java b/2022-02/spring-15-mvc/spring-mvc-solution-3/src/main/java/ru/otus/spring/domain/Person.java
index 4fea35dc..3a4c40b3 100644
--- a/2022-02/spring-15-mvc/spring-mvc-solution-3/src/main/java/ru/otus/spring/domain/Person.java
+++ b/2022-02/spring-15-mvc/spring-mvc-solution-3/src/main/java/ru/otus/spring/domain/Person.java
@@ -1,15 +1,18 @@
 package ru.otus.spring.domain;
 
-import org.springframework.data.annotation.Id;
-import org.springframework.data.keyvalue.annotation.KeySpace;
+import javax.persistence.Entity;
+import javax.persistence.Id;
 
-@KeySpace("person")
+@Entity
 public class Person {
 
     @Id
     private long id;
     private String name;
 
+    public Person() {
+    }
+
     public Person(String name) {
         this.name = name;
     }