diff --git a/docker/Makefile b/docker/Makefile
index 9881f6d0..f356b8c4 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -7,8 +7,7 @@ DOCKER_FILE = Dockerfile
 DOCKER := $(shell which docker)
 
 _DOCKER_ENV=\
-	-e CHAIN_ID=pstake \
-	-e PSTAKE_DIR=/pstaked \
+	-e CHAIN_ID=persistencecore \
 	-e COINS="100000000000000000stake" \
 	$(DOCKER_ENV)
 _DOCKER_VOLUME=\
@@ -31,10 +30,10 @@ docker-build:
 docker-run:
 	$(DOCKER) run --rm -it --name=$(CONTAINER_NAME) \
 		$(_DOCKER_VOLUME) $(_DOCKER_ARGS) $(_DOCKER_ENV) \
-		$(IMAGE_NAME):$(TAG_NAME) /bin/bash
+		$(DOCKER_IMAGE_NAME):$(DOCKER_TAG_NAME) /bin/bash
 
 docker-push:
-	$(DOCKER) push $(IMAGE_NAME):$(TAG_NAME)
+	$(DOCKER) push $(DOCKER_IMAGE_NAME):$(DOCKER_TAG_NAME)
 
 docker-build-push: docker-build docker-push
 
@@ -43,4 +42,4 @@ docker-clean-container:
 	-$(DOCKER) rm $(CONTAINER_NAME)
 
 docker-clean: docker-clean-container
-	-$(DOCKER) rmi $(IMAGE_NAME):$(TAG_NAME)
+	-$(DOCKER) rmi $(DOCKER_IMAGE_NAME):$(DOCKER_TAG_NAME)