diff --git a/.drone.yml b/.drone.yml
index f60a20f02d..cac0c38706 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -56,7 +56,7 @@ pipeline:
       event: [ push, tag, pull_request ]
 
   build-without-gcc:
-    image: webhippie/golang:edge
+    image: webhippie/golang:1.8
     pull: true
     environment:
       GOPATH: /srv/app
diff --git a/docs/content/doc/installation/from-source.en-us.md b/docs/content/doc/installation/from-source.en-us.md
index b4f804fd64..d40e649c84 100644
--- a/docs/content/doc/installation/from-source.en-us.md
+++ b/docs/content/doc/installation/from-source.en-us.md
@@ -17,7 +17,7 @@ menu:
 
 This section will not include basic [installation instructions](https://golang.org/doc/install).
 
-**Note**: Go version 1.7 or higher is required
+**Note**: Go version 1.8 or higher is required
 
 ## Download