diff --git a/Dockerfile b/Dockerfile
index 12bba77..2c3334d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -50,6 +50,9 @@ COPY docker-entrypoint.sh /usr/local/bin/
 RUN chmod +x /usr/local/bin/docker-entrypoint.sh
 RUN chmod +x /usr/local/bin/modprobe
 
+# Install Yarn
+RUN apk add --update --no-cache yarn
+
 ENV DOCKER_TLS_CERTDIR=/certs
 RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client
 
diff --git a/Makefile b/Makefile
index 4e8c5f9..4e4910c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,10 @@
-DOCKER_IMAGE=cubetiq/calpine-docker
-DOCKER_IMAGE_NAME=${DOCKER_IMAGE}:20.10.7
+DOCKER_IMAGE=cubetiq/calpine-docker-yarn
 
 build:
 	@echo 'Starting docker build'
 	docker build . -t ${DOCKER_IMAGE}
 
 	@echo 'Starting docker push'
-	docker tag ${DOCKER_IMAGE} ${DOCKER_IMAGE_NAME}
 	docker push ${DOCKER_IMAGE}
-	docker push ${DOCKER_IMAGE_NAME}
 
 .PHONY:build
\ No newline at end of file
diff --git a/README.md b/README.md
index 02f9c9c..098ce84 100644
--- a/README.md
+++ b/README.md
@@ -1,33 +1,32 @@
-# CUBETIQ Alpine OS Linux with Docker 20.10.7
-![Docker Image Size (latest by date)](https://img.shields.io/docker/image-size/cubetiq/calpine-docker)
-![Docker Pulls](https://img.shields.io/docker/pulls/cubetiq/calpine-docker)
+# CUBETIQ Alpine OS Linux with Docker and Yarn
+![Docker Image Size (latest by date)](https://img.shields.io/docker/image-size/cubetiq/calpine-docker-yarn)
+![Docker Pulls](https://img.shields.io/docker/pulls/cubetiq/calpine-docker-yarn)
 
 - CUBETIQ Alpine OS Linux (3.13.3)
 - Docker (20.10.7)
+- Yarn (1.22)
 
-# [Docker Hub](https://hub.docker.com/r/cubetiq/calpine-docker)
+# [Docker Hub](https://hub.docker.com/r/cubetiq/calpine-docker-yarn)
 ```shell
-docker push cubetiq/calpine-docker
+docker push cubetiq/calpine-docker-yarn
 ```
 
 # Usage
 ```shell
-docker run --rm -it cubetiq/calpine-docker /bin/sh
+docker run --rm -it cubetiq/calpine-docker-yarn /bin/sh
 ```
 
 # Example
 ```Dockerfile
-FROM cubetiq/calpine-docker:latest
+FROM cubetiq/calpine-docker-yarn:latest
 LABEL maintainer="sombochea@cubetiqs.com"
 
 RUN docker version
+RUN yarn --version
 
 CMD [ "sh" ]
 ```
 
-# Reference
-- Docker: [GitHub](https://github.com/docker-library/docker/tree/279ba9c93e8e26a15171645bd511ea8476c4706e/20.10)
-
 # Contributors
 - Sambo Chea <sombochea@cubetiqs.com>