diff --git a/terragrunt.yaml b/terragrunt.yaml
index 26267afc406..464ca0d30ba 100644
--- a/terragrunt.yaml
+++ b/terragrunt.yaml
@@ -1,7 +1,7 @@
 package:
   name: terragrunt
   version: 0.59.5
-  epoch: 0
+  epoch: 1
   description: Thin wrapper for Terraform providing extra tools
   copyright:
     - license: MIT
@@ -16,6 +16,7 @@ environment:
       - busybox
       - ca-certificates-bundle
       - go
+      - mockery
 
 pipeline:
   - uses: git-checkout
@@ -24,9 +25,17 @@ pipeline:
       repository: https://github.com/gruntwork-io/terragrunt
       tag: v${{package.version}}
 
-  - runs: |
-      go build -v -o bin/terragrunt -ldflags "-s -w -X  github.com/gruntwork-io/go-commons/version.Version=v${{package.version}}"
-      install -Dm755 bin/terragrunt "${{targets.contextdir}}"/usr/bin/terragrunt
+  - runs: go generate ./...
+
+  - uses: go/bump
+    with:
+      deps: github.com/hashicorp/go-getter@v1.7.5 github.com/hashicorp/go-retryablehttp@v0.7.7
+
+  - uses: go/build
+    with:
+      output: terragrunt
+      packages: .
+      ldflags: "-X  github.com/gruntwork-io/go-commons/version.Version=v${{package.version}}"
 
   - uses: strip
 
@@ -34,7 +43,8 @@ test:
   pipeline:
     - name: Verify terragrunt
       runs: |
-        terragrunt --version
+        set -o pipefail
+        terragrunt --version | grep "${{package.version}}"
 
 update:
   enabled: true