diff --git a/.devcontainer.json b/.devcontainer.json
index 35b2b8631..02e3c77cb 100644
--- a/.devcontainer.json
+++ b/.devcontainer.json
@@ -1,6 +1,6 @@
 {
 	"name": "Go for aks-engine",
-	"image": "quay.io/deis/go-dev:v1.25.2",
+	"image": "quay.io/deis/go-dev:v1.25.0",
 	"extensions": [
 		"ms-vscode.go"
 	],
diff --git a/.pipelines/pr-e2e.yaml b/.pipelines/pr-e2e.yaml
index 346867108..55069bfdd 100644
--- a/.pipelines/pr-e2e.yaml
+++ b/.pipelines/pr-e2e.yaml
@@ -17,7 +17,7 @@ pr:
 resources:
   containers:
   - container: dev1
-    image: quay.io/deis/go-dev:v1.25.2
+    image: quay.io/deis/go-dev:v1.25.0
 
 jobs:
 - job: unit_tests
diff --git a/.pipelines/vhd-builder.yaml b/.pipelines/vhd-builder.yaml
index 709078727..835027afc 100644
--- a/.pipelines/vhd-builder.yaml
+++ b/.pipelines/vhd-builder.yaml
@@ -7,7 +7,7 @@ trigger: none
 # - POST a new SKU to azure marketplace
 
 variables:
-  CONTAINER_IMAGE:  'quay.io/deis/go-dev:v1.25.2'
+  CONTAINER_IMAGE:  'quay.io/deis/go-dev:v1.25.0'
 
 phases:
 - phase: build_vhd
diff --git a/Makefile b/Makefile
index 39be1aa70..8f9d3a2f5 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ ifeq ($(GITTAG),)
 GITTAG := $(VERSION_SHORT)
 endif
 
-DEV_ENV_IMAGE := quay.io/deis/go-dev:v1.25.2
+DEV_ENV_IMAGE := quay.io/deis/go-dev:v1.25.0
 DEV_ENV_WORK_DIR := /aks-engine
 DEV_ENV_OPTS := --rm -v $(GOPATH)/pkg/mod:/go/pkg/mod -v $(CURDIR):$(DEV_ENV_WORK_DIR) -w $(DEV_ENV_WORK_DIR) $(DEV_ENV_VARS)
 DEV_ENV_CMD := docker run $(DEV_ENV_OPTS) $(DEV_ENV_IMAGE)
diff --git a/hack/tools/Makefile b/hack/tools/Makefile
index 6acb5e022..439f26cc1 100644
--- a/hack/tools/Makefile
+++ b/hack/tools/Makefile
@@ -17,7 +17,7 @@ $(LOCALBIN)/ginkgo:
 	GOBIN=$(LOCALBIN) $(GO) get github.com/onsi/ginkgo/ginkgo/...@v1.10.1
 
 $(LOCALBIN)/golangci-lint:
-	curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(LOCALBIN) v1.23.1
+	curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(LOCALBIN) v1.21.0
 
 $(LOCALBIN)/pub:
 	GOBIN=$(LOCALBIN) $(GO) get github.com/devigned/pub/...@v0.2.0
diff --git a/makedev.ps1 b/makedev.ps1
index 5ef7b0861..fd2977ba9 100644
--- a/makedev.ps1
+++ b/makedev.ps1
@@ -1,4 +1,4 @@
-$DEV_ENV_IMAGE = "quay.io/deis/go-dev:v1.25.2"
+$DEV_ENV_IMAGE = "quay.io/deis/go-dev:v1.25.0"
 $DEV_ENV_WORK_DIR = "/aks-engine"
 
 # Ensure docker is configured for linux containers