diff --git a/circle.yml b/circle.yml
index 6d61acd6f6a..faa50cb5c81 100644
--- a/circle.yml
+++ b/circle.yml
@@ -9,7 +9,7 @@ machine:
     GOPATH: "/home/ubuntu/.go_workspace"
     ORG_PATH: "github.com/grafana"
     REPO_PATH: "${ORG_PATH}/grafana"
-    GODIST: "go1.8rc3.linux-amd64.tar.gz"
+    GODIST: "go1.8.linux-amd64.tar.gz"
   post:
     - mkdir -p ~/download
     - mkdir -p ~/docker
diff --git a/scripts/build/Dockerfile b/scripts/build/Dockerfile
index 87a62a1a456..90302563546 100644
--- a/scripts/build/Dockerfile
+++ b/scripts/build/Dockerfile
@@ -23,10 +23,10 @@ RUN curl --silent --location https://rpm.nodesource.com/setup_6.x | bash - && \
 
 RUN wget https://dl.yarnpkg.com/rpm/yarn.repo -O /etc/yum.repos.d/yarn.repo && \
     yum install -y yarn --nogpgcheck && \
-    wget https://storage.googleapis.com/golang/go1.8rc3.linux-amd64.tar.gz && \
-    tar -C /usr/local -xzf go1.8rc3.linux-amd64.tar.gz
+    wget https://storage.googleapis.com/golang/go1.8.linux-amd64.tar.gz && \
+    tar -C /usr/local -xzf go1.8.linux-amd64.tar.gz
 
-ENV GOLANG_VERSION 1.8rc3
+ENV GOLANG_VERSION 1.8
 ENV PATH /usr/local/go/bin:$PATH
 
 RUN mkdir -p /go/src /go/bin && chmod -R 777 /go