diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index b31d155..006c60d 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -20,7 +20,7 @@ jobs:
         packages: write
       steps:
         - name: Checkout
-          uses: actions/checkout@v2
+          uses: actions/checkout@v3
         - name: Log in to the Container registry
           uses: docker/login-action@v3.3.0
           with:
@@ -45,27 +45,25 @@ jobs:
         packages: write
       steps:
         - name: Checkout
-          uses: actions/checkout@v2
-        - name: Log in to the Container registry
-          uses: docker/login-action@v3.3.0
+          uses: actions/checkout@v3
+        - uses: docker/metadata-action@v3
+          id: metadata
           with:
-            registry: ghcr.io
-            username: ${{ github.actor }}
-            password: ${{ secrets.GITHUB_TOKEN }}
+            images: ghcr.io/${{ github.repository }}
         - name: Determine tag name from branch name
           env:
             BRANCH_NAME: "${{ github.event.pull_request.head.ref }}"
           run: |
             echo "::set-output name=DOCKER_IMAGE_TAG::$(${BRANCH_NAME} | cut -d '/' -f 2)"
-        - name: Build necessary docker images
-          uses: hiberbee/github-action-skaffold@1.27.0
+        - name: Kaniko build
+          uses: aevea/action-kaniko@master
           with:
-            skaffold-version: 1.39.1
-            container-structure-test-version: 1.11.0
-            command: build
-            push: true
+            image: vscode-devcontainer-base
+            registry: ghcr.io
+            password: ${{ secrets.GITHUB_TOKEN }}
+            tag: ${{ env.DOCKER_IMAGE_TAG }}
             cache: true
-            tag: "${{ env.DOCKER_IMAGE_TAG }}"
+            cache_registry: cache
 
     build-and-push-release:
       if: startsWith(github.ref, 'refs/tags/')
@@ -75,9 +73,9 @@ jobs:
         packages: write
       steps:
         - name: Checkout
-          uses: actions/checkout@v2
+          uses: actions/checkout@v3
         - name: Log in to the Container registry
-          uses: docker/login-action@v3.3.0
+          uses: docker/login-action@v3
           with:
             registry: ghcr.io
             username: ${{ github.actor }}
diff --git a/adp-connect.sh b/adp-connect.sh
index 1662402..0c74f5b 100755
--- a/adp-connect.sh
+++ b/adp-connect.sh
@@ -978,13 +978,6 @@ if should_install "helm"; then
     info "🎉 Successfully installed Helm!"
 fi
 
-if should_install "k9s"; then
-    download_latest_release "derailed/k9s" "k9s" "tar.gz" || exit 1
-    extract_download "k9s" "tar.gz" || exit 1
-    install -m "0755" "${TEMP_DIR}/k9s" "$HOME/.local/bin/k9s" || exit 1
-    info "🎉 Successfully installed k9s!"
-fi
-
 if should_install "skaffold"; then
     download_latest_release "GoogleContainerTools/skaffold" "skaffold" || exit 1
     install -m "0755" "${TEMP_DIR}/skaffold" "$HOME/.local/bin/skaffold" || exit 1