diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1747604..f2a7a0d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -109,33 +109,4 @@ jobs:
             echo "$DOCKER_PASS" | docker login -u $DOCKER_USER --password-stdin 
       - run: 
           name: Execute goreleaser
-          command: ../goreleaser
-      
-# version: 2
-# jobs:
-#   build:
-#     docker:
-#       - image: v2tec/gobuilder:0.5.0_go1.7.4-glide0.12.3-goreleaser0.59.0-docker17.05.0
-#     working_directory: /src
-#     steps:
-#       - checkout
-#       - setup_remote_docker:
-#           version: 17.05.0-ce
-#       - run: git fetch --tags
-#       - run: |
-#           docker login -u $DOCKER_USER -p $DOCKER_PASS
-#           IS_RELEASE=$(if [ "$CIRCLE_TAG" != "" ] ; then echo release; else echo ci; fi;)
-#           /build.sh $IS_RELEASE || exit 1
-#           chmod 755 /src/dockerfile/push_containers.sh
-#           if [ "$CIRCLE_TAG" != "" ] ; then /src/dockerfile/push_containers.sh $CIRCLE_TAG; fi;
-
-#       - store_artifacts:
-#           path: /src/dist/
-# workflows:
-#   version: 2
-#   build-deploy:
-#     jobs:
-#       - build:
-#           filters:
-#             tags:
-#               only: /.*/
\ No newline at end of file
+          command: ../goreleaser
\ No newline at end of file
diff --git a/dockerfile/build/Dockerfile b/dockerfile/build/Dockerfile
deleted file mode 100644
index e68a80b..0000000
--- a/dockerfile/build/Dockerfile
+++ /dev/null
@@ -1,44 +0,0 @@
-FROM golang:1.7.4
-
-ARG BUILD_DATE
-ARG VCS_REF
-ARG VERSION
-
-LABEL org.label-schema.build-date=$BUILD_DATE \
-      org.label-schema.vcs-ref=$VCS_REF \
-      org.label-schema.vcs-url="https://github.com/stffabi/docker-gobuilder" \
-      org.label-schema.version="$VERSION" \
-      org.label-schema.schema-version="1.0"
-
-ARG goreleaser=0.59.0
-ARG docker=17.05.0-ce
-
-# Install goreleaser binary
-RUN curl --silent --show-error --fail --location \
-      --header "Accept: application/tar+gzip, application/x-gzip, application/octet-stream" -o - \
-      "https://github.com/goreleaser/goreleaser/releases/download/v${goreleaser}/goreleaser_Linux_x86_64.tar.gz" \
-    | tar --no-same-owner -C /usr/bin/ -xz goreleaser \
-  && chmod 0755 /usr/bin/goreleaser \
-  && /usr/bin/goreleaser -v
-
-# Install docker binary
-RUN mkdir -p /tmp \
-  && curl --silent --show-error --fail --location \
-      --header "Accept: application/tar+gzip, application/x-gzip, application/octet-stream" -o - \
-      "https://get.docker.com/builds/Linux/x86_64/docker-${docker}.tgz" \
-    | tar -xz -C /tmp \
-  && mv /tmp/docker/* /usr/bin \
-  && rm -rf /tmp \
-  && chmod 0755 /usr/bin/docker \
-  && chmod 0755 /usr/bin/docker* \
-  && /usr/bin/docker -v
-
-VOLUME /src
-WORKDIR /src
-
-COPY build_environment.sh /
-COPY build.sh /
-
-RUN chmod 0755 /*.sh
-
-ENTRYPOINT ["/build.sh"]
\ No newline at end of file
diff --git a/dockerfile/build/build.sh b/dockerfile/build/build.sh
deleted file mode 100644
index 8a09b5a..0000000
--- a/dockerfile/build/build.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash -e
-
-if [ -z "$1" ]
-then
-    echo "No argument supplied, please either supply 'release' for a release build or 'ci' for ci build."
-    exit 1
-fi
-
-source /build_environment.sh
-
-# Grab the last segment from the package name
-name=${pkgName##*/}
-
-echo "Running Tests $pkgName..."
-(
-  go test -v $(glide novendor) || exit 1
-)
-
-if [ "$1" == "release" ]
-then
-  echo "Release Building $pkgName..."
-  CGO_ENABLED=${CGO_ENABLED:-0} \
-  goreleaser
-else
-  echo "Snapshot Building $pkgName..."
-  CGO_ENABLED=${CGO_ENABLED:-0} \
-  goreleaser --snapshot --skip-publish
-fi
\ No newline at end of file
diff --git a/dockerfile/build/build_environment.sh b/dockerfile/build/build_environment.sh
deleted file mode 100644
index 71a713c..0000000
--- a/dockerfile/build/build_environment.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-files=$(ls -1 /src | wc -l)
-if [ "$files" == "0" ];
-then
-  echo "Error: Must mount Go source code into /src directory"
-  exit 990
-fi
-
-# Grab Go package name
-pkgName="$(go list -e -f '{{.ImportComment}}' 2>/dev/null || true)"
-
-if [ -z "$pkgName" ];
-then
-  echo "Error: Must add canonical import path to root package"
-  exit 992
-fi
-
-# Grab just first path listed in GOPATH
-goPath="${GOPATH%%:*}"
-
-# Construct Go package path
-pkgPath="$goPath/src/$pkgName"
-
-# Set-up src directory tree in GOPATH
-mkdir -p "$(dirname "$pkgPath")"
-
-# Link source dir into GOPATH
-ln -sf /src "$pkgPath"
-cd "$pkgPath"
-
-echo "Restoring dependencies..."
-if [ -e glide.yaml ];
-then
-  # Install dependencies with glide...
-  glide install
-else
-  # Get all package dependencies
-  go get -t -d -v ./...
-fi
\ No newline at end of file
diff --git a/dockerfile/push_containers.sh b/dockerfile/push_containers.sh
deleted file mode 100644
index d231f87..0000000
--- a/dockerfile/push_containers.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-
-PROGNAME=$(basename $0)
-VERSION_BUILD=$1
-
-function error_exit
-{
-    echo "${PROGNAME}: ${1:-"Unknown Error"}" 1>&2
-    exit 1
-}
-
-if [ "$1" = "" ]; then
-  error_exit "Please provide version as first argument."
-fi
-
-SEMVER=${VERSION_BUILD#*v}
-VERSION=`echo $SEMVER | awk '{split($0,a,"."); print a[1]}'`
-BUILD=`echo $SEMVER | awk '{split($0,a,"."); print a[2]}'`
-PATCH=`echo $SEMVER | awk '{split($0,a,"."); print a[3]}'`
-
-if [ "${VERSION}" = "" ]; then
-  echo "Please provide a semantic version."
-  exit 1
-fi
-
-if [ "${BUILD}" = "" ]; then
-  BUILD='0'
-fi
-
-if [ "${PATCH}" = "" ]; then
-  PATCH='0'
-fi
-
-push_docker() {
-  echo "  -> push $1 $2"
-  docker tag $1 $2 || exit 1
-  docker push $2 || exit 1
-}
-
-push_all() {
-    IMAGE_NAME_VERSION=${1}${VERSION}.${BUILD}.${PATCH}
-    echo "Pulling $IMAGE_NAME_VERSION..."
-    docker pull ${IMAGE_NAME_VERSION} || exit 1
-    echo "Pushing $IMAGE_NAME_VERSION..."
-    push_docker ${IMAGE_NAME_VERSION} ${1}${VERSION}.${BUILD}
-    push_docker ${IMAGE_NAME_VERSION} ${1}${VERSION}
-    push_docker ${IMAGE_NAME_VERSION} ${1}latest
-}
-
-IMAGE_NAME=containrrr/watchtower
-push_all ${IMAGE_NAME}:
-push_all ${IMAGE_NAME}:armhf-
-push_all ${IMAGE_NAME}:arm64v8-