diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0bead3e..9b67dde 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,7 +17,7 @@ add_library(${PROJECT_NAME}_objs OBJECT
     src/hello.hpp
     src/hello.cpp
 )
-target_link_libraries(${PROJECT_NAME}_objs PUBLIC userver-core)
+target_link_libraries(${PROJECT_NAME}_objs PUBLIC userver::core)
 
 
 # The Service
@@ -29,7 +29,7 @@ target_link_libraries(${PROJECT_NAME} PRIVATE ${PROJECT_NAME}_objs)
 add_executable(${PROJECT_NAME}_unittest
     src/hello_test.cpp
 )
-target_link_libraries(${PROJECT_NAME}_unittest PRIVATE ${PROJECT_NAME}_objs userver-utest)
+target_link_libraries(${PROJECT_NAME}_unittest PRIVATE ${PROJECT_NAME}_objs userver::utest)
 add_google_tests(${PROJECT_NAME}_unittest)
 
 
@@ -37,7 +37,7 @@ add_google_tests(${PROJECT_NAME}_unittest)
 add_executable(${PROJECT_NAME}_benchmark
     src/hello_benchmark.cpp
 )
-target_link_libraries(${PROJECT_NAME}_benchmark PRIVATE ${PROJECT_NAME}_objs userver-ubench)
+target_link_libraries(${PROJECT_NAME}_benchmark PRIVATE ${PROJECT_NAME}_objs userver::ubench)
 add_google_benchmark_tests(${PROJECT_NAME}_benchmark)
 
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 83737a0..50d2ad7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,25 +2,16 @@ version: "2.3"
 
 services:
     service_template-container:
-        image: ghcr.io/userver-framework/ubuntu-userver-build-base:v1
+        image: ghcr.io/userver-framework/ubuntu-22.04-userver-base-ci:latest
         privileged: true
         network_mode: bridge
         environment:
           - PREFIX=${PREFIX:-~/.local}
-          - CC
           - CCACHE_DIR=/service_template/.ccache
-          - CCACHE_HASHDIR
-          - CCACHE_NOHASHDIR
-          - CCACHE_PREFIX
-          - CCACHE_SIZE
-          - CMAKE_OPTS
           - CORES_DIR=/cores
-          - CXX
-          - MAKE_OPTS
-          - CMAKE_COMMON_FLAGS
         volumes:
           - .:/service_template:rw
-          - ./third_party/userver/tools/docker:/tools:ro
+          - ./third_party/userver/scripts/docker/:/tools:ro
         ports:
           - 8080:8080
         working_dir: /service_template
diff --git a/third_party/userver b/third_party/userver
index 320656f..2846de7 160000
--- a/third_party/userver
+++ b/third_party/userver
@@ -1 +1 @@
-Subproject commit 320656f015cef1a0e91a714dcb41aa543c97631f
+Subproject commit 2846de78187610740fd29d81195c06998ed6cdce