diff --git a/commit-watcher/Dockerfile b/commit-watcher/Dockerfile
deleted file mode 100644
index 96762fa..0000000
--- a/commit-watcher/Dockerfile
+++ /dev/null
@@ -1,37 +0,0 @@
-FROM ruby:alpine
-
-RUN	apk add --no-cache \
-	ca-certificates \
-	git \
-	libxml2 \
-	libxslt \
-	mariadb-dev \
-	nodejs \
-	tzdata
-
-RUN	set -x \
-	&& apk add --no-cache --virtual .build-deps \
-		build-base \
-		cmake \
-		libxml2-dev \
-		libxslt-dev \
-		pkgconfig \
-		ruby-json \
-	&& git clone --depth 1 https://github.com/srcclr/commit-watcher.git /usr/src/commit-watcher \
-	&& ( \
-		cd /usr/src/commit-watcher \
-		&& gem install \
-			activesupport-json_encoder \
-			--no-rdoc --no-ri \
-		&& bundle config build.nokogiri --use-system-libraries \
-		&& bundle update sdoc \
-		&& bundle install \
-	) \
-	&& apk del .build-deps
-
-WORKDIR /usr/src/commit-watcher
-
-COPY database.yml /usr/src/commit-watcher/config/database.yml
-VOLUME /usr/src/commit-watcher
-
-CMD ["./scripts/deploy"]
diff --git a/commit-watcher/database.yml b/commit-watcher/database.yml
deleted file mode 100644
index aa09ab3..0000000
--- a/commit-watcher/database.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-default: &default
-  adapter: mysql2
-  encoding: utf8
-  pool: 5
-  username: root
-  password:
-  # Use this for local mysql instances
-  socket: /var/run/mysqld/mysqld.sock
-
-  # Use this for Docker
-  #host: localhost:3306
-
-development:
-  <<: *default
-  database: commit_watcher_development
-
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
-test:
-  <<: *default
-  database: commit_watcher_test
-
-production:
-  <<: *default
-  username: commit_watcher
-  password: <%= ENV['COMMIT_WATCHER_DATABASE_PASSWORD'] %>
-  database: commit_watcher_production
diff --git a/k8scan/Dockerfile b/k8scan/Dockerfile
index 90ada40..cb560a1 100644
--- a/k8scan/Dockerfile
+++ b/k8scan/Dockerfile
@@ -14,7 +14,7 @@ RUN	apk add --no-cache \
 
 # Get go deps for tests etc.
 RUN go get honnef.co/go/tools/cmd/staticcheck \
-		github.com/golang/lint/golint \
+		golang.org/x/lint/golint \
 		github.com/google/go-cmp/cmp
 
 WORKDIR /go/src/k8scan