diff --git a/kurl_proxy/kustomize/base/kustomization.yaml b/kurl_proxy/kustomize/base/kustomization.yaml
index c38e72a98d..80d0415e3d 100644
--- a/kurl_proxy/kustomize/base/kustomization.yaml
+++ b/kurl_proxy/kustomize/base/kustomization.yaml
@@ -1,3 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 resources:
 - rbac.yaml
 - deployment.yaml
diff --git a/kurl_proxy/kustomize/overlays/dev/kustomization.yaml b/kurl_proxy/kustomize/overlays/dev/kustomization.yaml
index 96d8c5257f..a5cc288284 100644
--- a/kurl_proxy/kustomize/overlays/dev/kustomization.yaml
+++ b/kurl_proxy/kustomize/overlays/dev/kustomization.yaml
@@ -1,6 +1,6 @@
-bases:
-  - ../../base
-
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 resources:
-  - ./secret.yaml
-  - ./configmap.yaml
+- ./secret.yaml
+- ./configmap.yaml
+- ../../base
diff --git a/kustomize/base/deployment.yaml b/kustomize/base/deployment.yaml
index b2f637a8ae..54858ae1ee 100644
--- a/kustomize/base/deployment.yaml
+++ b/kustomize/base/deployment.yaml
@@ -14,7 +14,7 @@ spec:
       restartPolicy: Always
       containers:
         - name: kotsadm
-          image: kotsadm
+          image: kotsadm-api
           imagePullPolicy: IfNotPresent
           resources:
             limits:
diff --git a/kustomize/base/kustomization.yaml b/kustomize/base/kustomization.yaml
index ac86bafd9b..6dd2947919 100644
--- a/kustomize/base/kustomization.yaml
+++ b/kustomize/base/kustomization.yaml
@@ -1,4 +1,6 @@
 
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 resources:
-  - ./deployment.yaml
-  - ./service.yaml
+- ./deployment.yaml
+- ./service.yaml
diff --git a/kustomize/overlays/dev/kustomization.yaml b/kustomize/overlays/dev/kustomization.yaml
index c51e651f80..d35368a58a 100644
--- a/kustomize/overlays/dev/kustomization.yaml
+++ b/kustomize/overlays/dev/kustomization.yaml
@@ -1,14 +1,14 @@
-bases:
-  - ../../base
-  - ../rbac
-  - ../../../web/kustomize/overlays/dev
-  - ../../../kurl_proxy/kustomize/overlays/dev
-
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 resources:
-  - ./namespace.yaml
-
-patchesStrategicMerge:
-  - ./deployment.yaml
-
-commonLabels:
-  app.kubernetes.io/name: kotsadm
+- ./namespace.yaml
+- ../../base
+- ../rbac
+- ../../../web/kustomize/overlays/dev
+- ../../../kurl_proxy/kustomize/overlays/dev
+labels:
+- includeSelectors: true
+  pairs:
+    app.kubernetes.io/name: kotsadm
+patches:
+- path: ./deployment.yaml
diff --git a/kustomize/overlays/kotsstore/kustomization.yaml b/kustomize/overlays/kotsstore/kustomization.yaml
index a4162d009c..c359b800d8 100644
--- a/kustomize/overlays/kotsstore/kustomization.yaml
+++ b/kustomize/overlays/kotsstore/kustomization.yaml
@@ -1,7 +1,9 @@
-bases:
-  - ../dev
-  - ./minio
-  - ../../../migrations/kustomize/overlays/dev
 
-patchesStrategicMerge:
-  - ./deployment.yaml
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- ../dev
+- ./minio
+- ../../../migrations/kustomize/overlays/dev
+patches:
+- path: ./deployment.yaml
diff --git a/kustomize/overlays/kotsstore/minio/kustomization.yaml b/kustomize/overlays/kotsstore/minio/kustomization.yaml
index 83d10d11e6..f5b34fb7f9 100644
--- a/kustomize/overlays/kotsstore/minio/kustomization.yaml
+++ b/kustomize/overlays/kotsstore/minio/kustomization.yaml
@@ -1,4 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 resources:
-  - ./service.yaml
-  - ./secret.yaml
-  - ./statefulset.yaml
+- ./service.yaml
+- ./secret.yaml
+- ./statefulset.yaml
diff --git a/kustomize/overlays/ocistore/kustomization.yaml b/kustomize/overlays/ocistore/kustomization.yaml
index 15ecede391..526811afba 100644
--- a/kustomize/overlays/ocistore/kustomization.yaml
+++ b/kustomize/overlays/ocistore/kustomization.yaml
@@ -1,8 +1,7 @@
-bases:
-  - ../dev
-
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 resources:
-  - ./distribution/distribution.yaml
-
-patchesStrategicMerge:
-  - ./deployment.yaml
\ No newline at end of file
+- ./distribution/distribution.yaml
+- ../dev
+patches:
+- path: ./deployment.yaml
diff --git a/kustomize/overlays/okteto/kustomization.yaml b/kustomize/overlays/okteto/kustomization.yaml
index 5ec372c66d..43ccde212b 100644
--- a/kustomize/overlays/okteto/kustomization.yaml
+++ b/kustomize/overlays/okteto/kustomization.yaml
@@ -1,13 +1,13 @@
-  # - ../../../kurl_proxy/kustomize/overlays/dev
-
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 resources:
 - ../../base
 - ../../../web/kustomize/overlays/dev
 - ../../../migrations/kustomize/overlays/okteto
 - ../kotsstore/minio
-
-patchesStrategicMerge:
-- ./deployment.yaml
-
-commonLabels:
-  app.kubernetes.io/name: kotsadm
+labels:
+- includeSelectors: true
+  pairs:
+    app.kubernetes.io/name: kotsadm
+patches:
+- path: ./deployment.yaml
diff --git a/kustomize/overlays/rbac/kustomization.yaml b/kustomize/overlays/rbac/kustomization.yaml
index 32d6d17f95..4edd3776b1 100644
--- a/kustomize/overlays/rbac/kustomization.yaml
+++ b/kustomize/overlays/rbac/kustomization.yaml
@@ -1,3 +1,4 @@
-
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 resources:
-  - ./cluster-rbac.yaml
+- ./cluster-rbac.yaml
diff --git a/migrations/kustomize/base/kustomization.yaml b/migrations/kustomize/base/kustomization.yaml
index 1b43214164..419dcad196 100644
--- a/migrations/kustomize/base/kustomization.yaml
+++ b/migrations/kustomize/base/kustomization.yaml
@@ -1 +1,3 @@
-bases: []
\ No newline at end of file
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources: []
\ No newline at end of file
diff --git a/migrations/kustomize/overlays/dev/kustomization.yaml b/migrations/kustomize/overlays/dev/kustomization.yaml
index 3675bd4003..53a2c3c431 100644
--- a/migrations/kustomize/overlays/dev/kustomization.yaml
+++ b/migrations/kustomize/overlays/dev/kustomization.yaml
@@ -1,6 +1,6 @@
-bases:
-  - ../../base
-
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 resources:
-  - ./rqlite.yaml
-  - ./job.yaml
\ No newline at end of file
+- ./rqlite.yaml
+- ./job.yaml
+- ../../base
diff --git a/migrations/kustomize/overlays/okteto/kustomization.yaml b/migrations/kustomize/overlays/okteto/kustomization.yaml
index 8037a37378..10d9116314 100644
--- a/migrations/kustomize/overlays/okteto/kustomization.yaml
+++ b/migrations/kustomize/overlays/okteto/kustomization.yaml
@@ -1,6 +1,6 @@
-bases:
-  - ../../base
-
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 resources:
-  - ./rqlite.yaml
-  - ./migrations.yaml
+- ./rqlite.yaml
+- ./migrations.yaml
+- ../../base
diff --git a/skaffold.yaml b/skaffold.yaml
index d729086597..51e8c6e1b9 100644
--- a/skaffold.yaml
+++ b/skaffold.yaml
@@ -1,67 +1,45 @@
-apiVersion: skaffold/v2beta2
+apiVersion: skaffold/v4beta8
 kind: Config
-
-profiles:
-  - name: kotsstore
-    activation: 
-      - env: KOTSSTORE=
-    deploy:
-      kustomize:
-        paths: 
-          - "./kustomize/overlays/kotsstore"
-  - name: debug
-    activation:
-      - env: DEBUG_KOTSADM=1
-    patches:
-      - op: add
-        path: /build/artifacts/1/docker/buildArgs
-        value:
-          DEBUG_KOTSADM: 1
-
 build:
-  local:
-    concurrency: 0
-    useBuildkit: true
-
   artifacts:
     - image: kotsadm-web
-      context: "./web"
+      context: ./web
       sync:
         manual:
-          - src: "src/**/*.jsx"
-            dest: "./"
-          - src: "src/**/*.js"
-            dest: "./"
-          - src: "src/**/*.png"
-            dest: "./"
-          - src: "src/**/*.scss"
-            dest: "./"
-          - src: "src/**/*.css"
-            dest: "./"
+          - src: src/**/*.jsx
+            dest: ./
+          - src: src/**/*.js
+            dest: ./
+          - src: src/**/*.png
+            dest: ./
+          - src: src/**/*.scss
+            dest: ./
+          - src: src/**/*.css
+            dest: ./
       docker:
         dockerfile: ./skaffold.Dockerfile
-
-    - image: kotsadm
-      context: "./"
+    - image: kotsadm-api
+      context: ./
       docker:
         dockerfile: ./hack/dev/skaffold.Dockerfile
-
     - image: kotsadm-migrations
-      context: "./migrations"
+      context: ./migrations
       docker:
         dockerfile: ./skaffold.Dockerfile
-
     - image: kurl-proxy
-      context: "./kurl_proxy"
+      context: ./kurl_proxy
       docker:
         dockerfile: ./skaffold.Dockerfile
-
-deploy:
-  statusCheckDeadlineSeconds: 240
+  local:
+    useBuildkit: true
+    concurrency: 0
+manifests:
   kustomize:
     paths:
-      - "./kustomize/overlays/dev"
-
+      - ./kustomize/overlays/dev
+deploy:
+  kubectl: {}
+  statusCheckDeadlineSeconds: 240
 portForward:
   - resourceType: service
     resourceName: kotsadm
@@ -71,3 +49,21 @@ portForward:
     resourceName: kurl-proxy
     port: 8800
     localPort: 30880
+profiles:
+  - name: kotsstore
+    activation:
+      - env: KOTSSTORE=
+    manifests:
+      kustomize:
+        paths:
+          - ./kustomize/overlays/kotsstore
+    deploy:
+      kubectl: {}
+  - name: debug
+    activation:
+      - env: DEBUG_KOTSADM=1
+    patches:
+      - op: add
+        path: /build/artifacts/1/docker/buildArgs
+        value:
+          DEBUG_KOTSADM: 1
\ No newline at end of file
diff --git a/web/kustomize/base/kustomization.yaml b/web/kustomize/base/kustomization.yaml
index 6a253cd93e..40af899636 100644
--- a/web/kustomize/base/kustomization.yaml
+++ b/web/kustomize/base/kustomization.yaml
@@ -1,6 +1,4 @@
-
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 resources:
-  - ./deployment.yaml
-
-
-
+- ./deployment.yaml
diff --git a/web/kustomize/overlays/dev/kustomization.yaml b/web/kustomize/overlays/dev/kustomization.yaml
index 3f6a45e814..92e6ea785e 100644
--- a/web/kustomize/overlays/dev/kustomization.yaml
+++ b/web/kustomize/overlays/dev/kustomization.yaml
@@ -1,8 +1,7 @@
-bases:
-  - ../../base
-
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 resources:
-  - ./service.yaml
-
-patchesStrategicMerge:
-  - ./deployment.yaml
+- ./service.yaml
+- ../../base
+patches:
+- path: ./deployment.yaml
diff --git a/web/kustomize/overlays/kotsadm/kustomization.yaml b/web/kustomize/overlays/kotsadm/kustomization.yaml
index d4f9e7ef29..c70c425207 100644
--- a/web/kustomize/overlays/kotsadm/kustomization.yaml
+++ b/web/kustomize/overlays/kotsadm/kustomization.yaml
@@ -1,9 +1,8 @@
-bases:
-  - ../../base
-
-patchesStrategicMerge:
-  - ./deployment.yaml
-
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 resources:
-  - ./configmap.yaml
-  - ./service.yaml
+- ./configmap.yaml
+- ./service.yaml
+- ../../base
+patches:
+- path: ./deployment.yaml