diff --git a/.travis.yml b/.travis.yml
index ee19027..480d87e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,7 +26,7 @@ matrix:
 script:
   - set -e
   - docker build -t gmemstr/pogo .
-  - docker run -d --rm --name test  -p 8000:8000 gmemstre/pogo
+  - docker run -d --rm --name test  -p 8000:8000 gmemstr/pogo
   - sleep 10
   - docker ps | grep -q pogo 
   - set +e
diff --git a/Dockerfile b/Dockerfile
index 7b1e099..80a4ce4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,10 +2,10 @@
 FROM golang:latest
 
 # Set working directory
-WORKDIR /POGO
+WORKDIR %GOPATH%/src/POGO
 
 # Add source to container so we can build
-ADD . /POGO
+ADD . %GOPATH%/src/POGO
 
 # 1. Install make and dependencies
 # 2. Install Go dependencies
@@ -13,7 +13,8 @@ ADD . /POGO
 # 4. List directory structure (for debugging really)\
 # 5. Make empty podcast direcory
 # 6. Create empty feed files
-RUN godep restore && \
+RUN go get godep && \
+	godep restore && \
 	make linux && chmod +x pogoapp && \
 	ls -al && \
 	mkdir podcasts && \