diff --git a/.github/.kodiak.toml b/.github/.kodiak.toml
index ded81e43d..b64a5f6fc 100644
--- a/.github/.kodiak.toml
+++ b/.github/.kodiak.toml
@@ -15,4 +15,4 @@ strip_html_comments = true # default: false
 always = true # default: false
 
 [approve]
-auto_approve_usernames = ["1gtm", "tamalsaha"]
+auto_approve_usernames = ["tamalsaha", "1gtm", "1gtm-app[bot]"]
\ No newline at end of file
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3bda65555..871ed578f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -30,8 +30,6 @@ jobs:
 
       - name: Prepare Host
         run: |
-          sudo apt-get -qq update || true
-          sudo apt-get install -y bzr
           curl -LO https://dl.k8s.io/release/v1.32.1/bin/linux/amd64/kubectl
           chmod +x ./kubectl
           sudo mv ./kubectl /usr/local/bin/kubectl
diff --git a/.github/workflows/update-crds.yaml b/.github/workflows/update-crds.yml
similarity index 93%
rename from .github/workflows/update-crds.yaml
rename to .github/workflows/update-crds.yml
index c8541e81a..4154eec59 100644
--- a/.github/workflows/update-crds.yaml
+++ b/.github/workflows/update-crds.yml
@@ -34,8 +34,8 @@ jobs:
           cd $RUNNER_WORKSPACE
           git clone $url
           cd $(basename $INSTALLER_REPOSITORY)
-          git config user.name "${GITHUB_USER}"
-          git config user.email "${GITHUB_USER}@appscode.com"
+          git config user.name "1gtm"
+          git config user.email "1gtm@appscode.com"
 
       - name: Update crds
         env:
diff --git a/Makefile b/Makefile
index 2b6717e3f..7c22a01e7 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ REGISTRY ?= kubevault
 
 # This version-strategy uses git tags to set the version string
 git_branch       := $(shell git rev-parse --abbrev-ref HEAD)
-git_tag          := $(shell git describe --exact-match --abbrev=0 2>/dev/null || echo "")
+git_tag          := $(shell git describe --tags --exact-match --abbrev=0 2>/dev/null || echo "")
 commit_hash      := $(shell git rev-parse --verify HEAD)
 commit_timestamp := $(shell date --date="@$$(git show -s --format=%ct)" --utc +%FT%T)