diff --git a/Dockerfile b/Dockerfile
index cab78297910b..c58c6611ab69 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 MAINTAINER Lazar Demin (lazar@onion.io)
 
 ENV DEBIAN_FRONTEND=noninteractive
@@ -22,7 +22,7 @@ RUN apt-get update && apt-get install -y \
     unzip \
     libssl-dev \
     python-dev \
-    python-pip \
+    python3-pip \
     libxml-parser-perl \
     default-jdk
 
diff --git a/build.sh b/build.sh
new file mode 100755
index 000000000000..70808d399b5f
--- /dev/null
+++ b/build.sh
@@ -0,0 +1 @@
+docker build -t chmorgan/omega2-source .
diff --git a/tools/mkimage/patches/060-remove_kernel_includes.patch b/tools/mkimage/patches/060-remove_kernel_includes.patch
deleted file mode 100644
index e61d8cc4961b..000000000000
--- a/tools/mkimage/patches/060-remove_kernel_includes.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/include/compiler.h
-+++ b/include/compiler.h
-@@ -66,6 +66,11 @@ typedef uint8_t __u8;
- typedef uint16_t __u16;
- typedef uint32_t __u32;
- typedef unsigned int uint;
-+typedef uint64_t __u64;
-+#ifndef linux
-+typedef int __kernel_daddr_t;
-+typedef unsigned int __kernel_ino_t;
-+#endif
- 
- #define uswap_16(x) \
- 	((((x) & 0xff00) >> 8) | \
---- a/include/linux/posix_types.h
-+++ b/include/linux/posix_types.h
-@@ -43,6 +43,8 @@ typedef void (*__kernel_sighandler_t)(in
- /* Type of a SYSV IPC key.  */
- typedef int __kernel_key_t;
- 
-+#ifdef linux
- #include <asm/posix_types.h>
-+#endif
- 
- #endif /* _LINUX_POSIX_TYPES_H */
---- a/include/linux/types.h
-+++ b/include/linux/types.h
-@@ -2,7 +2,6 @@
- #define _LINUX_TYPES_H
- 
- #include <linux/posix_types.h>
--#include <asm/types.h>
- #include <stdbool.h>
- 
- #ifndef __KERNEL_STRICT_NAMES