diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5095fa44f..999fafd17 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,7 +1,7 @@
 defaults: &defaults
   working_directory: /go/src/github.com/gohugoio
   docker:
-      - image: bepsays/ci-goreleaser:0.34.2-9
+      - image: bepsays/ci-goreleaser:0.34.2-8
     
 version: 2
 jobs:
diff --git a/.travis.yml b/.travis.yml
index 787c29b37..3e94894fb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,8 +2,8 @@ language: go
 sudo: required
 dist: precise
 go:
+  - 1.8.7
   - 1.9.4
-  - 1.10
   - tip
 os:
   - linux
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 206c3d515..8a77485fb 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -36,4 +36,4 @@ parts:
       strip --remove-section=.comment --remove-section=.note $SNAPCRAFT_PART_INSTALL/bin/hugo
     after: [go]
   go:
-    source-tag: go1.10
+    source-tag: go1.9.4