diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000000..241e560df6
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,2 @@
+*
+
diff --git a/Dockerfile b/Dockerfile
index bea63cb110..edc487ef68 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:21.10 as build
+FROM ubuntu:22.04 as build
 ENV TZ=UTC
 
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone && \
@@ -26,5 +26,7 @@ ENV LANG C.UTF-8
 RUN mkdir /oot
 WORKDIR /oot
 
+RUN git config --global --add safe.directory /oot
+
 CMD ["/bin/sh", "-c", \
     "echo 'usage:\n  docker run --rm --mount type=bind,source=\"$(pwd)\",destination=/oot oot make -j$(nproc) setup\n  docker run --rm --mount type=bind,source=\"$(pwd)\",destination=/oot oot make -j$(nproc)'"]