diff --git a/Makefile b/Makefile
index 356035a8e..06974d4a2 100644
--- a/Makefile
+++ b/Makefile
@@ -38,12 +38,6 @@ lint-%: init-%
 build-%: lint-%
 	if [ -d $* ]; then $(HELM) package $*; fi
 
-# Note: user running helm3 can package the charts, but can run into helm lint
-# issue due to stricter logic in helm3. This adds a target to package charts
-# without executing a lint until the issues are fixed.
-package-%: init-%
-	if [ -d $* ]; then $(HELM) package $*; fi
-
 clean:
 	@echo "Removed .b64, _partials.tpl, and _globals.tpl files"
 	rm -f helm-toolkit/secrets/*.b64
diff --git a/playbooks/osh-infra-build.yaml b/playbooks/osh-infra-build.yaml
deleted file mode 100644
index 5765727d6..000000000
--- a/playbooks/osh-infra-build.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-- hosts: primary
-  vars_files:
-    - vars.yaml
-  vars:
-    work_dir: "{{ zuul.project.src_dir }}/{{ zuul_osh_infra_relative_path | default('') }}"
-  gather_facts: True
-  roles:
-    - build-helm-packages
-  tags:
-    - build-helm-packages
-
-- hosts: all
-  vars_files:
-    - vars.yaml
-  vars:
-    work_dir: "{{ zuul.project.src_dir }}/{{ zuul_osh_infra_relative_path | default('') }}"
-  gather_facts: False
-  become: yes
-  roles:
-    - build-images
-  tags:
-    - build-images
-...
diff --git a/playbooks/osh-infra-deploy-k8s.yaml b/playbooks/osh-infra-deploy-k8s.yaml
deleted file mode 100644
index fe867017d..000000000
--- a/playbooks/osh-infra-deploy-k8s.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-- hosts: primary
-  vars_files:
-    - vars.yaml
-  vars:
-    work_dir: "{{ zuul.project.src_dir }}/{{ zuul_osh_infra_relative_path | default('') }}"
-  gather_facts: True
-  roles:
-    - build-helm-packages
-    - deploy-kubeadm-aio-master
-  tags:
-    - build-helm-packages
-    - deploy-kubeadm-aio-master
-
-- hosts: nodes
-  vars_files:
-    - vars.yaml
-  vars:
-    work_dir: "{{ zuul.project.src_dir }}/{{ zuul_osh_infra_relative_path | default('') }}"
-  roles:
-    - deploy-kubeadm-aio-node
-  tags:
-    - deploy-kubeadm-aio-node
-...
diff --git a/tools/gate/devel/start.sh b/tools/gate/devel/start.sh
index fc2fc685e..d370079fc 100755
--- a/tools/gate/devel/start.sh
+++ b/tools/gate/devel/start.sh
@@ -66,12 +66,11 @@ if [ "x${DEPLOY}" == "xsetup-host" ]; then
   ansible_install
   PLAYBOOKS="osh-infra-deploy-docker"
 elif [ "x${DEPLOY}" == "xk8s" ]; then
-  PLAYBOOKS="osh-infra-build osh-infra-deploy-k8s"
+  ${WORK_DIR}/tools/deployment/common/000-install-packages.sh
+  ${WORK_DIR}/tools/gate/deploy-k8s.sh
+  exit 0
 elif [ "x${DEPLOY}" == "xlogs" ]; then
   PLAYBOOKS="osh-infra-collect-logs"
-elif [ "x${DEPLOY}" == "xfull" ]; then
-  ansible_install
-  PLAYBOOKS="osh-infra-deploy-docker osh-infra-build osh-infra-deploy-k8s osh-infra-collect-logs"
 else
   echo "Unknown Deploy Option Selected"
   exit 1