diff --git a/README.md b/README.md
index 14b3018..729cd62 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ jobs:
           run: echo "::set-output name=hash::$(git rev-parse --short HEAD)"
 
         - name: Update Coder Template
-            uses: matifali/update-coder-template@v1
+            uses: matifali/update-coder-template@latest
             with:
                 CODER_TEMPLATE_NAME: "my-template"
                 CODER_TEMPLATE_DIR: "my-template"
diff --git a/entrypoint.sh b/entrypoint.sh
index fb990e3..36478aa 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -11,4 +11,10 @@ if [ -z "${CODER_TEMPLATE_DIR}" ]; then
     CODER_TEMPLATE_DIR="${CODER_TEMPLATE_NAME}"
 fi
 
-coder templates push ${CODER_TEMPLATE_NAME} --directory ./${CODER_TEMPLATE_DIR} --url ${CODER_URL} --name ${CODER_TEMPLATE_VERSION} --yes
+# if the CODER_TEMPLATE_VERSION is empty string then let coder use a random name
+if [ -z "${CODER_TEMPLATE_VERSION}" ];
+then
+    coder templates push ${CODER_TEMPLATE_NAME} --directory ./${CODER_TEMPLATE_DIR} --url ${CODER_URL} --yes
+else
+    coder templates push ${CODER_TEMPLATE_NAME} --directory ./${CODER_TEMPLATE_DIR} --url ${CODER_URL} --name ${CODER_TEMPLATE_VERSION} --yes
+fi