diff --git a/Makefile b/Makefile
index a35729b..00564b5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,12 @@
 
 IMAGE_NAME:=hadolint-action
-
+YAMLLINT_VERSION:=0.34.0
+HADOLINT_VERSION:=1.19.3
 lint-dockerfile: ## Runs hadolint against application dockerfile
 	@docker run --rm -v "$(PWD):/data" -w "/data" hadolint/hadolint hadolint Dockerfile
 
 lint-yaml: ## Lints yaml configurations
-	@docker run --rm -v "$(PWD):/yaml" sdesbure/yamllint yamllint .
+	@docker run --rm -v "$(PWD):/yaml" pipelinecomponents/yamllint:$(YAMLLINT_VERSION) yamllint .
 
 build: ## Builds the docker image
 	@docker build . -t $(IMAGE_NAME)
@@ -13,7 +14,7 @@ build: ## Builds the docker image
 test: build ## Runs a test in the image
 	@docker run -i --rm \
     -v /var/run/docker.sock:/var/run/docker.sock \
-    -v ${PWD}:/test zemanlx/container-structure-test:v1.8.0-alpine \
+    -v ${PWD}:/test ghcr.io/googlecontainertools/container-structure-test:$(HADOLINT_VERSION) \
     test \
     --image $(IMAGE_NAME) \
     --config test/structure-tests.yaml