diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 21af75bcc..aa442c010 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -68,7 +68,7 @@ jobs:
         shell: powershell
 
   docker:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
       - run: git submodule update --init --recursive --force
diff --git a/Dockerfile b/Dockerfile
index 4297dec68..db4122f23 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ WORKDIR /app
 ADD . .
 
 # expect that host run `git submodule update --init`
-RUN make erigon rpcdaemon integration sentry hack
+RUN make erigon rpcdaemon integration sentry hack db-tools
 
 FROM docker.io/library/alpine:3.14
 
diff --git a/Makefile b/Makefile
index f49d1930f..246e4b346 100644
--- a/Makefile
+++ b/Makefile
@@ -110,9 +110,10 @@ tracker:
 	@echo "Done building."
 	@echo "Run \"$(GOBIN)/tracker\" to run snapshots tracker."
 
-db-tools: libmdbx
+db-tools:
 	@echo "Building db-tools"
-	git submodule update --init --recursive
+	rm -rf libmdbx # hub.docker.com setup incorrect gitpath for git modules. Just remove it and re-init submodule.
+	git submodule update --init --recursive --force
 	cd libmdbx && MDBX_BUILD_TIMESTAMP=unknown make tools
 	cp libmdbx/mdbx_chk $(GOBIN)
 	cp libmdbx/mdbx_copy $(GOBIN)