diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..32bc26e
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,17 @@
+build/
+pkg/
+dist/
+src/
+bin/
+*.pyc
+*.egg-info/
+
+.tmp
+.vagrant
+
+bower_components/
+node_modules/
+
+transfersh-server/run.sh
+.elasticbeanstalk/
+
diff --git a/.gitignore b/.gitignore
index 15ce9b5..f8201fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ bower_components/
 node_modules/
 
 transfersh-server/run.sh
+.elasticbeanstalk/
diff --git a/transfersh-server/Dockerfile b/Dockerfile
similarity index 89%
rename from transfersh-server/Dockerfile
rename to Dockerfile
index cb6bab1..01da0cc 100644
--- a/transfersh-server/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@ RUN mkdir -p /go/src/app
 WORKDIR /go/src/app
 
 # Copy the local package files to the container's workspace.
-ADD . /go/src/app
+ADD ./transfersh-server /go/src/app
 
 # install dependencies
 RUN go get ./