diff --git a/Dockerfile.ajv b/Dockerfile.ajv
index 82d2e54..fad22cd 100644
--- a/Dockerfile.ajv
+++ b/Dockerfile.ajv
@@ -2,4 +2,4 @@ FROM node:8-alpine
 
 RUN apk add --no-cache curl jq
 
-RUN npm install -g ajv-cli
\ No newline at end of file
+RUN npm install -g ajv-cli@3.3.0
\ No newline at end of file
diff --git a/Makefile b/Makefile
index f87bc44..812b1e3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 VERSION       ?= $(shell git describe --tags 2> /dev/null || echo v0)
 BASE_DIR      := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
-VALIDATOR_IMG := deislabs/cnab-spec.ajv
+VALIDATOR_IMG := cnabio/cnab-spec.ajv
 
 .PHONY: build-validator
 build-validator:
@@ -22,7 +22,7 @@ validate-url: build-validator
 
 .PHONY: build-validator-local
 build-validator-local:
-	@npm install -g ajv-cli
+	@npm install -g ajv-cli@3.3.0
 
 .PHONY: validate-local
 validate-local: build-validator-local