diff --git a/abc.templates/deployments/contents/deploy.sh b/abc.templates/deployments/contents/deploy.sh
index 0fa328d..9dd301e 100755
--- a/abc.templates/deployments/contents/deploy.sh
+++ b/abc.templates/deployments/contents/deploy.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-GITHUB_TOKEN_MINTER_VERSION='v0.0.16'
+GITHUB_TOKEN_MINTER_VERSION='REPLACE_VERSION_TAG'
 PLATFORM='amd64'
 IMAGE_NAME="REPLACE_FULL_IMAGE_NAME:${GITHUB_TOKEN_MINTER_VERSION}-${GITHUB_SHA}"
 
diff --git a/abc.templates/deployments/spec.yaml b/abc.templates/deployments/spec.yaml
index 4cf4439..4705cd9 100644
--- a/abc.templates/deployments/spec.yaml
+++ b/abc.templates/deployments/spec.yaml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: 'cli.abcxyz.dev/v1alpha1'
+apiVersion: 'cli.abcxyz.dev/v1beta5'
 kind: 'Template'
 
 desc: 'Generate the components necessary to deploy GitHub Token Minter'
@@ -73,3 +73,18 @@ steps:
           with: '{{.project_id}}'
         - to_replace: 'REPLACE_REGION'
           with: '{{.region}}'
+        - to_replace: 'REPLACE_VERSION_TAG'
+          with: '{{._git_tag}}'
+
+  - desc: 'Print warning if rendered without git tag'
+    action: 'print'
+    if: '_git_tag == ""'
+    params:
+      message: |-
+        #
+        # WARNING ##############################
+        #
+        # The template was rendered without a valid git tag. For best compatibility, we recommended
+        # re-rendering this template using one of the latest tags at https://github.com/abcxyz/github-metrics-aggregator/tags.
+        #
+        ########################################
diff --git a/abc.templates/infra/spec.yaml b/abc.templates/infra/spec.yaml
index 8c96357..0b38927 100644
--- a/abc.templates/infra/spec.yaml
+++ b/abc.templates/infra/spec.yaml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: 'cli.abcxyz.dev/v1alpha1'
+apiVersion: 'cli.abcxyz.dev/v1beta5'
 kind: 'Template'
 
 desc: 'Generate the infrastructure necessary to run GitHub Token Minter'