diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 000000000..cea180242
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,9 @@
+
+.git
+**/.gitignore
+
+**/*~
+**/target/
+**/nb-configuration.xml
+guacamole/customs.json
+
diff --git a/guacamole-docker/Dockerfile b/Dockerfile
similarity index 100%
rename from guacamole-docker/Dockerfile
rename to Dockerfile
diff --git a/guacamole-docker/.dockerignore b/guacamole-docker/.dockerignore
deleted file mode 100644
index 5792b764a..000000000
--- a/guacamole-docker/.dockerignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*~
-.git
-.gitignore
diff --git a/guacamole-docker/.gitignore b/guacamole-docker/.gitignore
deleted file mode 100644
index b25c15b81..000000000
--- a/guacamole-docker/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*~