diff --git a/.dockerignore b/.dockerignore
index 24c53156e..3624724ce 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,5 +1,6 @@
-Docker/Dockerfile*
 Dockerfile
+Docker/Ubuntu/Dockerfile
+Docker/Ubuntu/.dockerignore
 build*
 Build*
 xcode*
diff --git a/Docker/.dockerignore b/Docker/.dockerignore
deleted file mode 100644
index 3253b19e6..000000000
--- a/Docker/.dockerignore
+++ /dev/null
@@ -1 +0,0 @@
-Dockerfile*
diff --git a/Docker/Ubuntu/.dockerignore b/Docker/Ubuntu/.dockerignore
new file mode 100644
index 000000000..94143827e
--- /dev/null
+++ b/Docker/Ubuntu/.dockerignore
@@ -0,0 +1 @@
+Dockerfile
diff --git a/Docker/Dockerfile-ubuntu b/Docker/Ubuntu/Dockerfile
similarity index 94%
rename from Docker/Dockerfile-ubuntu
rename to Docker/Ubuntu/Dockerfile
index 9bfee5dbe..aaacb565a 100644
--- a/Docker/Dockerfile-ubuntu
+++ b/Docker/Ubuntu/Dockerfile
@@ -4,8 +4,8 @@
 ## rarely changes and can thus be built and pushed to Docker Hub manually.
 ##
 ## How to build the image:
-## - Change to the Docker/ directory of the MIRTK source tree
-## - Run "docker build -f Dockerfile-ubuntu -t biomedia/ubuntu:mirtk ."
+## - Change to the Docker/Ubuntu/ directory of the MIRTK source tree
+## - Run "docker build -t biomedia/ubuntu:mirtk ."
 ##
 ## Upload image to Docker Hub:
 ## - Log in with "docker login" command if necessary