diff --git a/.travis.yml b/.travis.yml
index 24426ef9..e0647813 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,14 +28,13 @@ jobs:
     deploy:
       provider: script
       skip_cleanup: true
-      script: ./build/build_img.sh && ./build/docker_login.sh && docker push filebrowser/filebrowser && docker logout
+      script: docker build -t filebrowser/filebrowser . && ./build/docker_login.sh && docker push filebrowser/filebrowser && docker logout
       on:
         tags: false
         repo: filebrowser/filebrowser
         branch: master
   - stage: release
     script:
-      - cp dockerfiles/filebrowser Dockerfile
       - ./build/docker_login.sh
       - docker run --rm -itv $(pwd):$WDIR -v /var/run/docker.sock:/var/run/docker.sock filebrowser/dev goreleaser
       - docker logout
diff --git a/dockerfiles/filebrowser b/Dockerfile
similarity index 100%
rename from dockerfiles/filebrowser
rename to Dockerfile
diff --git a/build/build_img.sh b/build/build_img.sh
deleted file mode 100755
index af1bcee5..00000000
--- a/build/build_img.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)/..
-
-cp dockerfiles/filebrowser Dockerfile
-docker build -t filebrowser/filebrowser .
-rm -f Dockerfile
diff --git a/build/build_img_dev.sh b/build/build_img_dev.sh
deleted file mode 100755
index d196069e..00000000
--- a/build/build_img_dev.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)/..
-
-mkdir -p tmp-dev
-cd tmp-dev
-cp ../dockerfiles/dev Dockerfile
-docker build -t filebrowser/dev .
-cd ..
-rm -rf tmp-dev
diff --git a/dockerfiles/dev b/dockerfiles/dev
deleted file mode 100644
index b6c3cc57..00000000
--- a/dockerfiles/dev
+++ /dev/null
@@ -1,34 +0,0 @@
-FROM golang:alpine AS base
-
-RUN apk add -U --no-cache git && \
-  go get github.com/alecthomas/gometalinter && \
-  gometalinter --install
-
-FROM golang:alpine
-
-WORKDIR /go/src/github.com/filebrowser/filebrowser
-
-COPY --from=base /go/bin /go/bin
-
-RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories && \
-  sed -i -e "s/v[0-9]\.[0-9]/edge/g" /etc/apk/repositories  && \
-  apk --no-cache -U upgrade && apk --no-cache add ca-certificates yarn git curl dos2unix && \
-  go get github.com/GeertJohan/go.rice/rice && \
-  curl -fsSL -o /go/bin/dep $( \
-    curl -s https://api.github.com/repos/golang/dep/releases/latest \
-    | grep "browser_download_url.*linux-amd64\"" \
-    | cut -d : -f 2,3 \
-    | tr -d \" \
-  ) && \
-  chmod +x /go/bin/dep && \
-  curl -sL https://git.io/goreleaser -o /go/bin/goreleaser && \
-  chmod +x /go/bin/goreleaser && \
-  curl -fsSL https://download.docker.com/linux/static/edge/x86_64/docker-18.05.0-ce.tgz | tar xvz --strip-components=1 docker/docker -C /go/bin && \
-  chmod +x /go/bin/docker && \
-  curl -fsSL $( \
-    curl -s https://api.github.com/repos/docker/docker-credential-helpers/releases/latest \
-    | grep "browser_download_url.*pass-.*-amd64"  \
-    | cut -d : -f 2,3 \
-    | tr -d \" \
-  ) | tar xv -C /go/bin && \
-  chmod + /go/bin/docker-credential-pass