diff --git a/.gitignore b/.gitignore
index 64a763c..13f884d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,9 +4,6 @@
 *.so
 *.dylib
 
-# Normal binary
-home-dns
-
 # Test binary, build with `go test -c`
 *.test
 
@@ -16,5 +13,11 @@ home-dns
 # Project-local glide cache, RE: https://github.com/Masterminds/glide/issues/736
 .glide/
 
+# Misc Go
+bin/
+pkg/
+src/github.com/
+src/gopkg.in/
+
 # Config files
 config.yml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 64c1efe..1e6cac7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,12 +9,14 @@ build:app:
   tags:
     - runner:k8s
   script:
-    - go get
-    - go build
+    - go get home-dns
+    - go build home-dns
   artifacts:
     paths:
-      - home-dns
+      - bin/home-dns
     expire_in: 1 hour
+  variables:
+    GOPATH: "${CI_PROJECT_DIR}"
 
 build:image:
   stage: image
diff --git a/Dockerfile b/Dockerfile
index 604ff30..d44c015 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 FROM apextoaster/base
 
-ADD ./home-dns /app/home-dns
+ADD ./bin/home-dns /app/home-dns
 
 CMD /app/home-dns /app/config.yml
diff --git a/main.go b/src/home-dns/main.go
similarity index 100%
rename from main.go
rename to src/home-dns/main.go