diff --git a/hack/go-fmt.sh b/hack/go-fmt.sh
index c94e8232d3..04c82bf1e4 100755
--- a/hack/go-fmt.sh
+++ b/hack/go-fmt.sh
@@ -9,7 +9,6 @@ else
     --env IS_CONTAINER=TRUE \
     --volume "${PWD}:/go/src/sigs.k8s.io/cluster-api-provider-aws:z" \
     --workdir /go/src/sigs.k8s.io/cluster-api-provider-aws \
-    --entrypoint sh \
-    quay.io/coreos/golang-testing \
+    openshift/origin-release:golang-1.10 \
     ./hack/go-fmt.sh "${@}"
 fi
diff --git a/hack/go-lint.sh b/hack/go-lint.sh
index 534574169b..417d47ce6f 100755
--- a/hack/go-lint.sh
+++ b/hack/go-lint.sh
@@ -4,11 +4,11 @@
 if [ "$IS_CONTAINER" != "" ]; then
   golint -set_exit_status "${@}"
 else
+  echo "OK"
   docker run --rm \
     --env IS_CONTAINER=TRUE \
     --volume "${PWD}:/go/src/sigs.k8s.io/cluster-api-provider-aws:z" \
     --workdir /go/src/sigs.k8s.io/cluster-api-provider-aws \
-    --entrypoint sh \
-    quay.io/coreos/golang-testing \
+    openshift/origin-release:golang-1.10 \
     ./hack/go-lint.sh "${@}"
 fi
diff --git a/hack/go-vet.sh b/hack/go-vet.sh
index 4b396db60a..c854533e8c 100755
--- a/hack/go-vet.sh
+++ b/hack/go-vet.sh
@@ -6,6 +6,6 @@ else
     --env IS_CONTAINER=TRUE \
     --volume "${PWD}:/go/src/sigs.k8s.io/cluster-api-provider-aws:z" \
     --workdir /go/src/sigs.k8s.io/cluster-api-provider-aws \
-    quay.io/coreos/golang-testing \
+    openshift/origin-release:golang-1.10 \
     ./hack/go-vet.sh "${@}"
 fi;