diff --git a/.drone.yml b/.drone.yml
index 29d3215bc..2c1bc0603 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -37,6 +37,15 @@ pipeline:
     when:
       event: [ push, tag ]
 
+  publish_server_alpine:
+    image: plugins/docker
+    repo: drone/drone
+    secrets: [ docker_username, docker_password ]
+    tag: [ alpine ]
+    when:
+      branch: master
+      event: push
+
   publish_server:
     image: plugins/docker
     repo: drone/drone
@@ -46,6 +55,16 @@ pipeline:
       branch: master
       event: push
 
+  publish_agent_alpine:
+    image: plugins/docker
+    repo: drone/agent
+    dockerfile: Dockerfile.agent.alpine
+    secrets: [ docker_username, docker_password ]
+    tag: [ alpine ]
+    when:
+      branch: master
+      event: push
+
   publish_agent_arm:
     image: plugins/docker
     repo: drone/agent
@@ -80,7 +99,7 @@ pipeline:
     image: plugins/docker
     repo: drone/drone
     secrets: [ docker_username, docker_password ]
-    tag: [ 0.8, 0.8.0 ]
+    tag: [ 0.8, 0.8.1 ]
     when:
       event: tag
 
@@ -89,7 +108,7 @@ pipeline:
     repo: drone/agent
     dockerfile: Dockerfile.agent
     secrets: [ docker_username, docker_password ]
-    tag: [ 0.8, 0.8.0 ]
+    tag: [ 0.8, 0.8.1 ]
     when:
       event: tag
 
diff --git a/Dockerfile.agent b/Dockerfile.agent
index 5c4c752bc..d5f5feb56 100644
--- a/Dockerfile.agent
+++ b/Dockerfile.agent
@@ -1,6 +1,6 @@
 # docker build --rm -f Dockerfile.agent -t drone/agent .
 
-FROM centurylink/ca-certs
+FROM drone/ca-certs
 ENV GODEBUG=netdns=go
 ADD release/drone-agent /bin/
 
diff --git a/Dockerfile.agent.alpine b/Dockerfile.agent.alpine
new file mode 100644
index 000000000..36417d306
--- /dev/null
+++ b/Dockerfile.agent.alpine
@@ -0,0 +1,12 @@
+FROM alpine:3.6
+
+RUN apk add -U --no-cache ca-certificates && rm -rf /var/cache/apk/*
+
+ENV GODEBUG=netdns=go
+ADD release/drone-agent /bin/
+
+EXPOSE 3000
+HEALTHCHECK CMD ["/bin/drone-agent", "ping"]
+
+ENTRYPOINT ["/bin/drone-agent"]
+
diff --git a/Dockerfile.agent.linux.arm b/Dockerfile.agent.linux.arm
index f045a201b..ca5ea0253 100644
--- a/Dockerfile.agent.linux.arm
+++ b/Dockerfile.agent.linux.arm
@@ -1,4 +1,4 @@
-FROM centurylink/ca-certs
+FROM drone/ca-certs
 ENV GODEBUG=netdns=go
 ENV DRONE_PLATFORM=linux/arm
 ADD release/linux/arm/drone-agent /bin/
diff --git a/Dockerfile.agent.linux.arm64 b/Dockerfile.agent.linux.arm64
index 332014daa..0c4371970 100644
--- a/Dockerfile.agent.linux.arm64
+++ b/Dockerfile.agent.linux.arm64
@@ -1,4 +1,4 @@
-FROM centurylink/ca-certs
+FROM drone/ca-certs
 ENV GODEBUG=netdns=go
 ENV DRONE_PLATFORM=linux/arm64
 ADD release/linux/arm64/drone-agent /bin/
diff --git a/Dockerfile.alpine b/Dockerfile.alpine
new file mode 100644
index 000000000..72cb5ed71
--- /dev/null
+++ b/Dockerfile.alpine
@@ -0,0 +1,13 @@
+FROM alpine:3.6
+EXPOSE 8000 9000 80 443
+
+RUN apk add -U --no-cache ca-certificates && rm -rf /var/cache/apk/*
+
+ENV DATABASE_DRIVER=sqlite3
+ENV DATABASE_CONFIG=/var/lib/drone/drone.sqlite
+ENV GODEBUG=netdns=go
+ENV XDG_CACHE_HOME /var/lib/drone
+
+ADD release/drone-server /bin/
+
+ENTRYPOINT ["/bin/drone-server"]
diff --git a/version/version.go b/version/version.go
index 1cf538f55..52cf42360 100644
--- a/version/version.go
+++ b/version/version.go
@@ -8,7 +8,7 @@ var (
 	// VersionMinor is for functionality in a backwards-compatible manner.
 	VersionMinor int64 = 8
 	// VersionPatch is for backwards-compatible bug fixes.
-	VersionPatch int64 = 0
+	VersionPatch int64 = 1
 	// VersionPre indicates prerelease.
 	VersionPre string
 	// VersionDev indicates development branch. Releases will be empty string.