diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7788ac6..779cfab 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2
 jobs:
   build:
     docker: # run the steps with Docker
-      - image: circleci/golang:1.17.10
+      - image: circleci/golang:1.17
     steps:
       - checkout # check out source code to working directory
 
diff --git a/Makefile b/Makefile
index 15a8f1d..60849ed 100644
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,7 @@ install:
 
 .PHONY: docker-login
 docker-login:
-	echo ${DOCKER_PASS} | docker login -u ${DOCKER_USER} --password-stdin
+	@echo "$$DOCKER_PASSWORD" | docker login -u "${DOCKER_USER}" --password-stdin "${REGISTRY}"
 
 .PHONY: docker-images
 docker-images:
@@ -65,7 +65,7 @@ docker-push:
 
 .PHONY: containerd-login
 containerd-login:
-	@echo "$(DOCKER_PASS)" | nerdctl login -u "$(DOCKER_USER)" --password-stdin
+	@echo "$$DOCKER_PASSWORD" | nerdctl login -u "${DOCKER_USER}" --password-stdin "${REGISTRY}"
 
 .PHONY: containerd-images
 containerd-images: