diff --git a/.estafette.yaml b/.estafette.yaml
index 3d3b045..c56f09a 100644
--- a/.estafette.yaml
+++ b/.estafette.yaml
@@ -18,7 +18,7 @@ stages:
   build-lint-and-package:
     parallelStages:
       build:
-        image: golang:1.13.7-alpine3.11
+        image: golang:1.15.2-alpine3.12
         env:
           CGO_ENABLED: 0
           GOOS: linux
@@ -66,7 +66,7 @@ stages:
   test-helm-chart:
     services:
     - name: kubernetes
-      image: bsycorp/kind:latest-1.12
+      image: bsycorp/kind:latest-1.17
       readiness:
         path: /kubernetes-ready
         port: 10080
@@ -78,11 +78,12 @@ stages:
   clone-charts-repo:
     image: extensions/git-clone:dev
     repo: helm-charts
-    branch: master
+    branch: main
 
   publish-helm-chart:
     image: extensions/helm:dev
     action: publish
+    repoBranch: main
 
   slack-notify:
     image: extensions/slack-build-status:dev
@@ -99,11 +100,12 @@ releases:
       clone-charts-repo:
         image: extensions/git-clone:dev
         repo: helm-charts
-        branch: master
+        branch: main
 
       purge-prerelease-helm-charts:
         image: extensions/helm:dev
         action: purge
+        repoBranch: main
 
       create-github-release:
         image: extensions/github-release:dev
\ No newline at end of file