diff --git a/roles/deploy-env/files/kubeadm_config.yaml b/roles/deploy-env/files/kubeadm_config.yaml
index e314a2dc7..137e0781a 100644
--- a/roles/deploy-env/files/kubeadm_config.yaml
+++ b/roles/deploy-env/files/kubeadm_config.yaml
@@ -13,3 +13,15 @@ networking:
   podSubnet: "{{ kubeadm.pod_network_cidr }}"  # --pod-network-cidr
   dnsDomain: "cluster.local"
 ...
+---
+apiVersion: kubeadm.k8s.io/v1beta3
+kind: InitConfiguration
+nodeRegistration:
+  taints: []
+...
+---
+apiVersion: kubeadm.k8s.io/v1beta3
+kind: JoinConfiguration
+nodeRegistration:
+  taints: []
+...
diff --git a/roles/deploy-env/tasks/client_cluster_ssh.yaml b/roles/deploy-env/tasks/client_cluster_ssh.yaml
index 7fcee1076..c8a07a1bb 100644
--- a/roles/deploy-env/tasks/client_cluster_ssh.yaml
+++ b/roles/deploy-env/tasks/client_cluster_ssh.yaml
@@ -32,6 +32,7 @@
   when: cluster_ssh_user == "root"
 
 - name: Setup ssh keys
+  become_user: "{{ client_ssh_user }}"
   block:
     - name: Generate ssh key pair
       shell: |
@@ -46,6 +47,7 @@
       when: (inventory_hostname in (groups['primary'] | default([])))
 
 - name: Setup passwordless ssh from primary and cluster nodes
+  become_user: "{{ cluster_ssh_user }}"
   block:
     - name: Set primary ssh public key
       set_fact:
diff --git a/roles/deploy-env/tasks/k8s_client.yaml b/roles/deploy-env/tasks/k8s_client.yaml
index 7991e291b..d352223e8 100644
--- a/roles/deploy-env/tasks/k8s_client.yaml
+++ b/roles/deploy-env/tasks/k8s_client.yaml
@@ -63,8 +63,4 @@
       become_user: "{{ kubectl.user }}"
       command: helm repo remove stable
       ignore_errors: true
-
-- name: Untaint Kubernetes control plane node
-  become: false
-  command: kubectl taint nodes -l 'node-role.kubernetes.io/control-plane' node-role.kubernetes.io/control-plane-
 ...
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 8c8987363..21d0bb994 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -363,8 +363,7 @@
 - job:
     name: openstack-helm-infra-tls-2024-1-ubuntu_jammy
     description: |
-      This job uses OSH Ceph charts for managing Ceph cluster.
-      The job is run on 1 32GB node.
+      This job uses Rook for managing Ceph cluster.
     parent: openstack-helm-tls-2024-1-ubuntu_jammy
     files:
       - ^helm-toolkit/.*
@@ -376,14 +375,11 @@
       - ^openvswitch/.*
 
 - job:
-    name: openstack-helm-infra-tls-mariadb-ingress-2024-1-ubuntu_jammy
-    description: |
-      This job uses OSH Ceph charts for managing Ceph cluster.
-      The job is run on 1 32GB node.
-    parent: openstack-helm-tls-2024-1-ubuntu_jammy
+    name: openstack-helm-infra-mariadb-ingress-2024-1-ubuntu_jammy
+    parent: openstack-helm-compute-kit-2024-1-ubuntu_jammy
     vars:
       osh_params:
-        feature_gates: "tls,ingress-service"
+        feature_gates: "ingress-service"
     files:
       - ^helm-toolkit/.*
       - ^roles/.*
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 58b951338..0ffeee6d9 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -35,7 +35,6 @@
         - openstack-helm-infra-keystone-cilium-2024-1-ubuntu_jammy
         - openstack-helm-infra-keystone-flannel-2024-1-ubuntu_jammy
         - openstack-helm-infra-ceph-migrate
-        - openstack-helm-infra-tls-mariadb-ingress-2024-1-ubuntu_jammy
     gate:
       jobs:
         - openstack-helm-lint