diff --git a/frameworks/Go/aah/aah.dockerfile b/frameworks/Go/aah/aah.dockerfile
index a686146913f..9185548c81a 100644
--- a/frameworks/Go/aah/aah.dockerfile
+++ b/frameworks/Go/aah/aah.dockerfile
@@ -1,4 +1,6 @@
-FROM techempower/go-lang:0.1
+FROM golang:1.10.1
+
+RUN apt update -yqq && apt install unzip
 
 ADD ./ /aah
 WORKDIR /aah
diff --git a/frameworks/Go/aah/src/benchmark/app/db/datasource.go b/frameworks/Go/aah/src/benchmark/app/db/datasource.go
index cf658ad7fd5..b44ef21b704 100644
--- a/frameworks/Go/aah/src/benchmark/app/db/datasource.go
+++ b/frameworks/Go/aah/src/benchmark/app/db/datasource.go
@@ -3,7 +3,6 @@ package db
 import (
 	"database/sql"
 	"fmt"
-	"os"
 	"runtime"
 
 	"aahframework.org/aah.v0"
@@ -26,10 +25,7 @@ func DB() *sql.DB {
 // DatabaseInit initializes the Database.
 func DatabaseInit(e *aah.Event) {
 	cfg := aah.AppConfig()
-	dbHost := os.Getenv("DBHOST")
-	if dbHost == "" {
-		dbHost = "localhost"
-	}
+	dbHost := "tfb-database"
 
 	dbURL := fmt.Sprintf(cfg.StringDefault("datasource.benchmark.url", ""), dbHost)
 
diff --git a/frameworks/Go/beego/beego-orm-mysql.dockerfile b/frameworks/Go/beego/beego-orm-mysql.dockerfile
index c7edf66dc6d..051fc4e93b6 100644
--- a/frameworks/Go/beego/beego-orm-mysql.dockerfile
+++ b/frameworks/Go/beego/beego-orm-mysql.dockerfile
@@ -1,4 +1,4 @@
-FROM techempower/go-lang:0.1
+FROM golang:1.10.1
 
 ADD ./ /beego
 WORKDIR /beego
diff --git a/frameworks/Go/beego/beego.dockerfile b/frameworks/Go/beego/beego.dockerfile
index 816a789b7a0..3fd81c05f34 100644
--- a/frameworks/Go/beego/beego.dockerfile
+++ b/frameworks/Go/beego/beego.dockerfile
@@ -1,4 +1,4 @@
-FROM techempower/go-lang:0.1
+FROM golang:1.10.1
 
 ADD ./ /beego
 WORKDIR /beego
diff --git a/frameworks/Go/echo/echo.dockerfile b/frameworks/Go/echo/echo.dockerfile
index ea44467077d..73ebad61133 100644
--- a/frameworks/Go/echo/echo.dockerfile
+++ b/frameworks/Go/echo/echo.dockerfile
@@ -1,4 +1,4 @@
-FROM techempower/go-lang:0.1
+FROM golang:1.10.1
 
 ADD ./ /echo
 WORKDIR /echo
diff --git a/frameworks/Go/echo/src/app/main.go b/frameworks/Go/echo/src/app/main.go
index f2bcca89390..29953ce24b9 100644
--- a/frameworks/Go/echo/src/app/main.go
+++ b/frameworks/Go/echo/src/app/main.go
@@ -9,7 +9,6 @@ import (
 	"log"
 	"math/rand"
 	"net/http"
-	"os"
 	"sort"
 	"strconv"
 
@@ -265,10 +264,7 @@ func InitRoutes(e *echo.Echo) {
 }
 
 func InitPostgres() {
-	host := os.Getenv("DBHOST")
-	if host == "" {
-		host = "localhost"
-	}
+	host := "tfb-database"
 
 	var err error
 	db, err = sql.Open("postgres", fmt.Sprintf(connectionString, host))
diff --git a/frameworks/Go/falcore/falcore.dockerfile b/frameworks/Go/falcore/falcore.dockerfile
index f7d96985ab2..2d4d311adf5 100644
--- a/frameworks/Go/falcore/falcore.dockerfile
+++ b/frameworks/Go/falcore/falcore.dockerfile
@@ -1,4 +1,4 @@
-FROM techempower/go-lang:0.1
+FROM golang:1.10.1
 
 ADD ./ /falcore
 WORKDIR /falcore
diff --git a/frameworks/Go/fasthttp/fasthttp-postgresql.dockerfile b/frameworks/Go/fasthttp/fasthttp-postgresql.dockerfile
index 1dd496d31e5..98e9fdfa56c 100644
--- a/frameworks/Go/fasthttp/fasthttp-postgresql.dockerfile
+++ b/frameworks/Go/fasthttp/fasthttp-postgresql.dockerfile
@@ -1,4 +1,4 @@
-FROM techempower/go-lang:0.1
+FROM golang:1.10.1
 
 ADD ./ /fasthttp
 WORKDIR /fasthttp
diff --git a/frameworks/Go/fasthttp/fasthttp.dockerfile b/frameworks/Go/fasthttp/fasthttp.dockerfile
index f9f4d188868..a0af5b515ba 100644
--- a/frameworks/Go/fasthttp/fasthttp.dockerfile
+++ b/frameworks/Go/fasthttp/fasthttp.dockerfile
@@ -1,4 +1,4 @@
-FROM techempower/go-lang:0.1
+FROM golang:1.10.1
 
 ADD ./ /fasthttp
 WORKDIR /fasthttp
diff --git a/frameworks/Go/gin/gin.dockerfile b/frameworks/Go/gin/gin.dockerfile
index 5691cc5ce2d..9386f1d45f8 100644
--- a/frameworks/Go/gin/gin.dockerfile
+++ b/frameworks/Go/gin/gin.dockerfile
@@ -1,4 +1,4 @@
-FROM techempower/go-lang:0.1
+FROM golang:1.10.1
 
 ADD ./ /gin
 WORKDIR /gin
diff --git a/frameworks/Go/gin/hello.go b/frameworks/Go/gin/hello.go
index c253550d51d..f86c6b41d1f 100644
--- a/frameworks/Go/gin/hello.go
+++ b/frameworks/Go/gin/hello.go
@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"log"
 	"math/rand"
-	"os"
 	"runtime"
 	"sort"
 	"strconv"
@@ -161,7 +160,7 @@ func init() {
 	runtime.GOMAXPROCS(runtime.NumCPU())
 
 	dsn := "benchmarkdbuser:benchmarkdbpass@tcp(%s:3306)/hello_world"
-	dbhost := os.Getenv("DBHOST")
+	dbhost := "tfb-database"
 
 	db, err := sql.Open("mysql", fmt.Sprintf(dsn, dbhost))
 	if err != nil {
diff --git a/frameworks/Go/go-std/go-base.dockerfile b/frameworks/Go/go-std/go-base.dockerfile
deleted file mode 100644
index be18f6f20dc..00000000000
--- a/frameworks/Go/go-std/go-base.dockerfile
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM techempower/go-lang:0.1
-
-ADD ./ /go-std
-WORKDIR /go-std
-
-RUN mkdir bin
-ENV GOPATH /go-std
-ENV PATH ${GOPATH}/bin:${PATH}
diff --git a/frameworks/Go/go-std/go-interpolate.dockerfile b/frameworks/Go/go-std/go-interpolate.dockerfile
index 7cfe5718159..b1522886865 100644
--- a/frameworks/Go/go-std/go-interpolate.dockerfile
+++ b/frameworks/Go/go-std/go-interpolate.dockerfile
@@ -1,4 +1,11 @@
-FROM techempower/go-base:0.1
+FROM golang:1.10.1
+
+ADD ./ /go-std
+WORKDIR /go-std
+
+RUN mkdir bin
+ENV GOPATH /go-std
+ENV PATH ${GOPATH}/bin:${PATH}
 
 RUN go get github.com/go-sql-driver/mysql
 CMD go run hello_mysql.go
diff --git a/frameworks/Go/go-std/go-mongo.dockerfile b/frameworks/Go/go-std/go-mongo.dockerfile
index ffd569aa490..555add5045a 100644
--- a/frameworks/Go/go-std/go-mongo.dockerfile
+++ b/frameworks/Go/go-std/go-mongo.dockerfile
@@ -1,5 +1,12 @@
-FROM techempower/go-base:0.1
+FROM golang:1.10.1
 
-RUN apt-get install -y libsasl2-dev
+ADD ./ /go-std
+WORKDIR /go-std
+
+RUN mkdir bin
+ENV GOPATH /go-std
+ENV PATH ${GOPATH}/bin:${PATH}
+
+RUN apt update -yqq && apt install -yqq libsasl2-dev
 RUN go get gopkg.in/mgo.v2
 CMD go run hello_mongo.go
diff --git a/frameworks/Go/go-std/go-postgres.dockerfile b/frameworks/Go/go-std/go-postgres.dockerfile
index 6a4da40690a..6ed04c26da6 100644
--- a/frameworks/Go/go-std/go-postgres.dockerfile
+++ b/frameworks/Go/go-std/go-postgres.dockerfile
@@ -1,4 +1,11 @@
-FROM techempower/go-base:0.1
+FROM golang:1.10.1
+
+ADD ./ /go-std
+WORKDIR /go-std
+
+RUN mkdir bin
+ENV GOPATH /go-std
+ENV PATH ${GOPATH}/bin:${PATH}
 
 RUN go get github.com/lib/pq
 CMD go run hello_postgres.go
diff --git a/frameworks/Go/go-std/go-prefork.dockerfile b/frameworks/Go/go-std/go-prefork.dockerfile
index a80ca94e109..4a5fb05213b 100644
--- a/frameworks/Go/go-std/go-prefork.dockerfile
+++ b/frameworks/Go/go-std/go-prefork.dockerfile
@@ -1,4 +1,11 @@
-FROM techempower/go-base:0.1
+FROM golang:1.10.1
+
+ADD ./ /go-std
+WORKDIR /go-std
+
+RUN mkdir bin
+ENV GOPATH /go-std
+ENV PATH ${GOPATH}/bin:${PATH}
 
 RUN go get github.com/go-sql-driver/mysql
 CMD go run hello_mysql.go -prefork
diff --git a/frameworks/Go/go-std/go.dockerfile b/frameworks/Go/go-std/go.dockerfile
index 7cfe5718159..b1522886865 100644
--- a/frameworks/Go/go-std/go.dockerfile
+++ b/frameworks/Go/go-std/go.dockerfile
@@ -1,4 +1,11 @@
-FROM techempower/go-base:0.1
+FROM golang:1.10.1
+
+ADD ./ /go-std
+WORKDIR /go-std
+
+RUN mkdir bin
+ENV GOPATH /go-std
+ENV PATH ${GOPATH}/bin:${PATH}
 
 RUN go get github.com/go-sql-driver/mysql
 CMD go run hello_mysql.go
diff --git a/frameworks/Go/goji/goji.dockerfile b/frameworks/Go/goji/goji.dockerfile
index 64d7fc46602..9d63e658c5d 100644
--- a/frameworks/Go/goji/goji.dockerfile
+++ b/frameworks/Go/goji/goji.dockerfile
@@ -1,4 +1,4 @@
-FROM techempower/go-lang:0.1
+FROM golang:1.10.1
 
 ADD ./ /goji
 WORKDIR /goji
diff --git a/frameworks/Go/kami/kami.dockerfile b/frameworks/Go/kami/kami.dockerfile
index 0b3fcc1645a..7ffd87e0579 100644
--- a/frameworks/Go/kami/kami.dockerfile
+++ b/frameworks/Go/kami/kami.dockerfile
@@ -1,4 +1,4 @@
-FROM techempower/go-lang:0.1
+FROM golang:1.10.1
 
 ADD ./ /kami
 WORKDIR /kami
diff --git a/frameworks/Go/revel/revel-base.dockerfile b/frameworks/Go/revel/revel-base.dockerfile
deleted file mode 100644
index 98fad024677..00000000000
--- a/frameworks/Go/revel/revel-base.dockerfile
+++ /dev/null
@@ -1,13 +0,0 @@
-FROM techempower/go-lang:0.1
-
-ADD ./ /revel
-WORKDIR /revel
-
-RUN mkdir bin
-ENV GOPATH /revel
-ENV PATH ${GOPATH}/bin:${PATH}
-
-RUN go get -u github.com/go-sql-driver/mysql
-RUN go get -u github.com/revel/cmd/revel
-RUN go get -u github.com/coocood/qbs
-RUN go get -u github.com/eaigner/jet
diff --git a/frameworks/Go/revel/revel-jet.dockerfile b/frameworks/Go/revel/revel-jet.dockerfile
index 53a6f851070..36059657248 100644
--- a/frameworks/Go/revel/revel-jet.dockerfile
+++ b/frameworks/Go/revel/revel-jet.dockerfile
@@ -1,3 +1,15 @@
-FROM techempower/revel-base:0.1
+FROM golang:1.10.1
+
+ADD ./ /revel
+WORKDIR /revel
+
+RUN mkdir bin
+ENV GOPATH /revel
+ENV PATH ${GOPATH}/bin:${PATH}
+
+RUN go get -u github.com/go-sql-driver/mysql
+RUN go get -u github.com/revel/cmd/revel
+RUN go get -u github.com/coocood/qbs
+RUN go get -u github.com/eaigner/jet
 
 CMD revel run benchmark prod
diff --git a/frameworks/Go/revel/revel-qbs.dockerfile b/frameworks/Go/revel/revel-qbs.dockerfile
index 53a6f851070..36059657248 100644
--- a/frameworks/Go/revel/revel-qbs.dockerfile
+++ b/frameworks/Go/revel/revel-qbs.dockerfile
@@ -1,3 +1,15 @@
-FROM techempower/revel-base:0.1
+FROM golang:1.10.1
+
+ADD ./ /revel
+WORKDIR /revel
+
+RUN mkdir bin
+ENV GOPATH /revel
+ENV PATH ${GOPATH}/bin:${PATH}
+
+RUN go get -u github.com/go-sql-driver/mysql
+RUN go get -u github.com/revel/cmd/revel
+RUN go get -u github.com/coocood/qbs
+RUN go get -u github.com/eaigner/jet
 
 CMD revel run benchmark prod
diff --git a/frameworks/Go/revel/revel-raw.dockerfile b/frameworks/Go/revel/revel-raw.dockerfile
index 53a6f851070..36059657248 100644
--- a/frameworks/Go/revel/revel-raw.dockerfile
+++ b/frameworks/Go/revel/revel-raw.dockerfile
@@ -1,3 +1,15 @@
-FROM techempower/revel-base:0.1
+FROM golang:1.10.1
+
+ADD ./ /revel
+WORKDIR /revel
+
+RUN mkdir bin
+ENV GOPATH /revel
+ENV PATH ${GOPATH}/bin:${PATH}
+
+RUN go get -u github.com/go-sql-driver/mysql
+RUN go get -u github.com/revel/cmd/revel
+RUN go get -u github.com/coocood/qbs
+RUN go get -u github.com/eaigner/jet
 
 CMD revel run benchmark prod
diff --git a/frameworks/Go/revel/revel.dockerfile b/frameworks/Go/revel/revel.dockerfile
index 53a6f851070..36059657248 100644
--- a/frameworks/Go/revel/revel.dockerfile
+++ b/frameworks/Go/revel/revel.dockerfile
@@ -1,3 +1,15 @@
-FROM techempower/revel-base:0.1
+FROM golang:1.10.1
+
+ADD ./ /revel
+WORKDIR /revel
+
+RUN mkdir bin
+ENV GOPATH /revel
+ENV PATH ${GOPATH}/bin:${PATH}
+
+RUN go get -u github.com/go-sql-driver/mysql
+RUN go get -u github.com/revel/cmd/revel
+RUN go get -u github.com/coocood/qbs
+RUN go get -u github.com/eaigner/jet
 
 CMD revel run benchmark prod
diff --git a/frameworks/Go/webgo/webgo.dockerfile b/frameworks/Go/webgo/webgo.dockerfile
index 1acfb73560e..57f3df51d2e 100644
--- a/frameworks/Go/webgo/webgo.dockerfile
+++ b/frameworks/Go/webgo/webgo.dockerfile
@@ -1,4 +1,4 @@
-FROM techempower/go-lang:0.1
+FROM golang:1.10.1
 
 ADD ./ /webgo
 WORKDIR /webgo
diff --git a/toolset/setup/docker/languages/go-lang.dockerfile b/toolset/setup/docker/languages/go-lang.dockerfile
deleted file mode 100644
index 60f4cc35484..00000000000
--- a/toolset/setup/docker/languages/go-lang.dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM techempower/base:0.1
-
-RUN mkdir /go-lang
-WORKDIR /go-lang
-RUN curl -sL https://storage.googleapis.com/golang/go1.10.linux-amd64.tar.gz | tar xz
-
-ENV GOROOT /go-lang/go
-ENV PATH ${GOROOT}/bin:${PATH}
-
-ENV GOGC 1000