diff --git a/Makefile b/Makefile
index 5d10e65f0f..286560609e 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,6 @@ PATCH := $(shell echo $(SOURCE_GIT_TAG) | awk -F'[._~-]' '{print $$3}')
 
 SRC_ROOT :=$(shell pwd)
 
-WITH_KINDNET ?= 0
 # MICROSHIFT_VARIANT: specify this make variable to build microshift with community feature set.
 # If MICROSHIFT_VARIANT is unset or != community, build MicroShift with enterprise feature set, which requires openshift pull-secret.
 # OCP telemetry is disabled in community version.
@@ -274,7 +273,6 @@ rpm:
 	SOURCE_GIT_TAG=${SOURCE_GIT_TAG} \
 	SOURCE_GIT_COMMIT=${SOURCE_GIT_COMMIT} \
 	SOURCE_GIT_TREE_STATE=${SOURCE_GIT_TREE_STATE} \
-	WITH_KINDNET=${WITH_KINDNET} \
 	MICROSHIFT_VARIANT=${MICROSHIFT_VARIANT} \
 	./packaging/rpm/make-rpm.sh rpm local
 .PHONY: rpm
@@ -285,7 +283,6 @@ srpm:
 	SOURCE_GIT_TAG=${SOURCE_GIT_TAG} \
 	SOURCE_GIT_COMMIT=${SOURCE_GIT_COMMIT} \
 	SOURCE_GIT_TREE_STATE=${SOURCE_GIT_TREE_STATE} \
-	WITH_KINDNET=${WITH_KINDNET} \
 	MICROSHIFT_VARIANT=${MICROSHIFT_VARIANT} \
 	./packaging/rpm/make-rpm.sh srpm local
 .PHONY: srpm
@@ -303,7 +300,6 @@ rpm-podman:
 		--rm -i \
 		--volume $$(pwd):/opt/microshift:z \
 		--env TARGET_ARCH=$(TARGET_ARCH) \
-		--env WITH_KINDNET=$(WITH_KINDNET) \
 		microshift-builder:$(RPM_BUILDER_IMAGE_TAG) \
 		bash -ilc 'cd /opt/microshift && make rpm & pid=$$! ; \
 				   trap "echo Killing make PID $${pid}; kill $${pid}" INT ; \
diff --git a/assets/optional/kindnet/00-namespace.yaml b/assets/optional/kindnet/00-namespace.yaml
deleted file mode 100644
index 97fff125bb..0000000000
--- a/assets/optional/kindnet/00-namespace.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: kube-kindnet
-  labels:
-    name: kube-kindnet
-    openshift.io/run-level: "0"
-    openshift.io/cluster-monitoring: "true"
-    pod-security.kubernetes.io/enforce: privileged
-    pod-security.kubernetes.io/audit: privileged
-    pod-security.kubernetes.io/warn: privileged
-  annotations:
-    openshift.io/node-selector: ""
-    openshift.io/description: "kindnet Kubernetes components"
-    workload.openshift.io/allowed: "management"
diff --git a/assets/optional/kindnet/01-service-account.yaml b/assets/optional/kindnet/01-service-account.yaml
deleted file mode 100644
index 27d49f3a1e..0000000000
--- a/assets/optional/kindnet/01-service-account.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: kindnet
-  namespace: kube-kindnet
\ No newline at end of file
diff --git a/assets/optional/kindnet/02-cluster-role.yaml b/assets/optional/kindnet/02-cluster-role.yaml
deleted file mode 100644
index 05fe118b20..0000000000
--- a/assets/optional/kindnet/02-cluster-role.yaml
+++ /dev/null
@@ -1,88 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: kindnet
-rules:
-  - apiGroups: [""]
-    resources:
-      - namespaces
-      - nodes
-      - pods
-    verbs:
-      - get
-      - list
-      - patch
-      - watch
-      - update
-  - apiGroups: [""]
-    resources:
-      - pods
-    verbs:
-      - get
-      - list
-      - patch
-      - watch
-      - delete
-  - apiGroups: [""]
-    resources:
-      - configmaps
-    verbs:
-      - get
-      - create
-      - update
-      - patch
-  - apiGroups: [""]
-    resources:
-      - services
-      - endpoints
-    verbs:
-      - get
-      - list
-      - watch
-  - apiGroups:
-      - discovery.k8s.io
-    resources:
-      - endpointslices
-    verbs:
-      - list
-      - watch
-  - apiGroups: ["networking.k8s.io"]
-    resources:
-      - networkpolicies
-    verbs:
-      - get
-      - list
-      - watch
-  - apiGroups: ["", "events.k8s.io"]
-    resources:
-      - events
-    verbs:
-      - create
-      - patch
-      - update
-  - apiGroups: ["security.openshift.io"]
-    resources:
-      - securitycontextconstraints
-    verbs:
-      - use
-    resourceNames:
-      - privileged
-  - apiGroups: [""]
-    resources:
-      - "nodes/status"
-    verbs:
-      - patch
-      - update
-  - apiGroups: ["apiextensions.k8s.io"]
-    resources:
-      - customresourcedefinitions
-    verbs:
-      - get
-      - list
-      - watch
-  - apiGroups: ['authentication.k8s.io']
-    resources: ['tokenreviews']
-    verbs: ['create']
-  - apiGroups: ['authorization.k8s.io']
-    resources: ['subjectaccessreviews']
-    verbs: ['create']
\ No newline at end of file
diff --git a/assets/optional/kindnet/03-cluster-role-binding.yaml b/assets/optional/kindnet/03-cluster-role-binding.yaml
deleted file mode 100644
index e19e3c1707..0000000000
--- a/assets/optional/kindnet/03-cluster-role-binding.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: kindnet
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: kindnet
-subjects:
-  - kind: ServiceAccount
-    name: kindnet
-    namespace: kube-kindnet
\ No newline at end of file
diff --git a/assets/optional/kindnet/04-daemonset.yaml b/assets/optional/kindnet/04-daemonset.yaml
deleted file mode 100644
index 2d79ca8dfc..0000000000
--- a/assets/optional/kindnet/04-daemonset.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
-apiVersion: apps/v1
-kind: DaemonSet
-metadata:
-  labels:
-    app: kindnet
-    k8s-app: kindnet
-    tier: node
-  name: kube-kindnet-ds
-  namespace: kube-kindnet
-spec:
-  selector:
-    matchLabels:
-      app: kindnet
-      k8s-app: kindnet
-  template:
-    metadata:
-      labels:
-        app: kindnet
-        k8s-app: kindnet
-        tier: node
-    spec:
-      affinity:
-        nodeAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-            nodeSelectorTerms:
-              - matchExpressions:
-                  - key: kubernetes.io/os
-                    operator: In
-                    values:
-                      - linux
-      containers:
-        - name: kube-kindnet
-          image: kindnet
-          imagePullPolicy: IfNotPresent
-          env:
-          - name: HOST_IP
-            valueFrom:
-              fieldRef:
-                fieldPath: status.hostIP
-          - name: POD_IP
-            valueFrom:
-              fieldRef:
-                fieldPath: status.podIP
-          - name: POD_SUBNET
-            value: 10.244.0.0/16
-          resources:
-            requests:
-              cpu: 100m
-              memory: 50Mi
-          securityContext:
-            capabilities:
-              add:
-                - NET_ADMIN
-                - NET_RAW
-            privileged: false
-          volumeMounts:
-            - name: cni
-              mountPath: /etc/cni/net.d
-            - name: xtables-lock
-              mountPath: /run/xtables.lock
-              readOnly: false
-            - name: lib-modules
-              mountPath: /lib/modules
-              readOnly: true
-            - name: nri-plugin
-              mountPath: /var/run/nri
-      hostNetwork: true
-      priorityClassName: system-node-critical
-      serviceAccountName: kindnet
-      tolerations:
-        - effect: NoSchedule
-          operator: Exists
-      volumes:
-        - hostPath:
-            path: /etc/cni/net.d
-          name: cni
-        - hostPath:
-            path: /run/xtables.lock
-            type: FileOrCreate
-          name: xtables-lock
-        - name: lib-modules
-          hostPath:
-            path: /lib/modules
-        - name: nri-plugin
-          hostPath:
-            path: /var/run/nri
\ No newline at end of file
diff --git a/assets/optional/kindnet/kustomization.aarch64.yaml b/assets/optional/kindnet/kustomization.aarch64.yaml
deleted file mode 100644
index 9d3190e0a6..0000000000
--- a/assets/optional/kindnet/kustomization.aarch64.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-images:
-  - name: kindnet
-    newName: docker.io/kindest/kindnetd
-    digest: sha256:2bdc3188f2ddc8e54841f69ef900a8dde1280057c97500f966a7ef31364021f1
\ No newline at end of file
diff --git a/assets/optional/kindnet/kustomization.x86_64.yaml b/assets/optional/kindnet/kustomization.x86_64.yaml
deleted file mode 100644
index b52b339342..0000000000
--- a/assets/optional/kindnet/kustomization.x86_64.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-images:
-  - name: kindnet
-    newName: docker.io/kindest/kindnetd
-    digest: sha256:7a9c9fa59dd517cdc2c82eef1e51392524dd285e9cf7cb5a851c49f294d6cd11
\ No newline at end of file
diff --git a/assets/optional/kindnet/kustomization.yaml b/assets/optional/kindnet/kustomization.yaml
deleted file mode 100644
index 2f4dab61c5..0000000000
--- a/assets/optional/kindnet/kustomization.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-  - 00-namespace.yaml
-  - 01-service-account.yaml
-  - 02-cluster-role.yaml
-  - 03-cluster-role-binding.yaml
-  - 04-daemonset.yaml
diff --git a/assets/optional/kindnet/release-kindnet-aarch64.json b/assets/optional/kindnet/release-kindnet-aarch64.json
deleted file mode 100644
index c17b1e6a84..0000000000
--- a/assets/optional/kindnet/release-kindnet-aarch64.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "release": {
-    "base": "4.20.0-0.nightly-arm64-2025-06-03-221556"
-  },
-  "images": {
-    "kindnet": "docker.io/kindest/kindnetd@sha256:2bdc3188f2ddc8e54841f69ef900a8dde1280057c97500f966a7ef31364021f1"
-  }
-}
diff --git a/assets/optional/kindnet/release-kindnet-x86_64.json b/assets/optional/kindnet/release-kindnet-x86_64.json
deleted file mode 100644
index 90ed41935d..0000000000
--- a/assets/optional/kindnet/release-kindnet-x86_64.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "release": {
-    "base": "4.20.0-0.nightly-2025-06-02-175911"
-  },
-  "images": {
-    "kindnet": "docker.io/kindest/kindnetd@sha256:7a9c9fa59dd517cdc2c82eef1e51392524dd285e9cf7cb5a851c49f294d6cd11"
-  }
-}
diff --git a/assets/optional/kube-proxy/00-namespace.yaml b/assets/optional/kube-proxy/00-namespace.yaml
deleted file mode 100644
index 3b8d6cea37..0000000000
--- a/assets/optional/kube-proxy/00-namespace.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: kube-proxy
-  labels:
-    name: kindnet
-    openshift.io/run-level: "0"
-    openshift.io/cluster-monitoring: "true"
-    pod-security.kubernetes.io/enforce: privileged
-    pod-security.kubernetes.io/audit: privileged
-    pod-security.kubernetes.io/warn: privileged
-  annotations:
-    openshift.io/node-selector: ""
-    openshift.io/description: "kube-proxy Kubernetes components"
-    workload.openshift.io/allowed: "management"
\ No newline at end of file
diff --git a/assets/optional/kube-proxy/01-service-account.yaml b/assets/optional/kube-proxy/01-service-account.yaml
deleted file mode 100644
index 9b118afada..0000000000
--- a/assets/optional/kube-proxy/01-service-account.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  labels:
-    k8s-app: kube-proxy
-  name: kube-proxy
-  namespace: kube-proxy
\ No newline at end of file
diff --git a/assets/optional/kube-proxy/02-cluster-role.yaml b/assets/optional/kube-proxy/02-cluster-role.yaml
deleted file mode 100644
index ae9c2bb2fc..0000000000
--- a/assets/optional/kube-proxy/02-cluster-role.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: system:kube-proxy
-rules:
-  - apiGroups:
-      - ""
-    resources:
-      - services
-      - endpoints
-      - nodes
-      - configmaps
-    verbs:
-      - list
-      - watch
-      - get
-  - apiGroups: ["discovery.k8s.io"]
-    resources:
-      - endpointslices
-    verbs:
-      - list
-      - watch
-      - get
\ No newline at end of file
diff --git a/assets/optional/kube-proxy/03-cluster-role-binding.yaml b/assets/optional/kube-proxy/03-cluster-role-binding.yaml
deleted file mode 100644
index 2edc2f198c..0000000000
--- a/assets/optional/kube-proxy/03-cluster-role-binding.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: system:kube-proxy
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: system:kube-proxy
-subjects:
-  - kind: ServiceAccount
-    name: kube-proxy
-    namespace: kube-proxy
\ No newline at end of file
diff --git a/assets/optional/kube-proxy/04-configmap.yaml b/assets/optional/kube-proxy/04-configmap.yaml
deleted file mode 100644
index 0ef2a1b683..0000000000
--- a/assets/optional/kube-proxy/04-configmap.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-apiVersion: v1
-data:
-  config.conf: |
-    apiVersion: kubeproxy.config.k8s.io/v1alpha1
-    kind: KubeProxyConfiguration
-    clusterCIDR: 10.42.0.0/16
-    mode: iptables
-    clientConnection:
-      kubeconfig: /var/lib/kubeconfig
-    iptables:
-      masqueradeAll: true
-    conntrack:
-      maxPerCore: 0
-    featureGates:
-      AllAlpha: false
-kind: ConfigMap
-metadata:
-  labels:
-    app: kube-proxy
-    k8s-app: kube-proxy
-  name: kube-proxy
-  namespace: kube-proxy
\ No newline at end of file
diff --git a/assets/optional/kube-proxy/05-daemonset.yaml b/assets/optional/kube-proxy/05-daemonset.yaml
deleted file mode 100644
index cf8bdaa0e1..0000000000
--- a/assets/optional/kube-proxy/05-daemonset.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
-apiVersion: apps/v1
-kind: DaemonSet
-metadata:
-  name: kube-proxy
-  namespace: kube-proxy
-spec:
-  selector:
-    matchLabels:
-      k8s-app: kube-proxy
-  template:
-    metadata:
-      labels:
-        k8s-app: kube-proxy
-    spec:
-      affinity:
-        nodeAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-            nodeSelectorTerms:
-              - matchExpressions:
-                  - key: kubernetes.io/os
-                    operator: In
-                    values:
-                      - linux
-      serviceAccountName: kube-proxy  # Reference the Service Account here
-      containers:
-        - name: kube-proxy
-          image: kube-proxy
-          command:
-            - /usr/bin/kube-proxy
-            - --config=/var/lib/kube-proxy/config.conf
-          volumeMounts:
-            - name: config
-              mountPath: /var/lib/kube-proxy/
-              readOnly: true
-            - name: kubeconfig
-              mountPath: /var/lib/kubeconfig
-              readOnly: true
-          securityContext:
-            privileged: true
-      hostNetwork: true  # Allows the pod to use the host network
-      dnsPolicy: ClusterFirstWithHostNet
-      tolerations:
-        - effect: NoSchedule
-          operator: Exists
-      volumes:
-        - name: config
-          configMap:
-            name: kube-proxy
-        - hostPath:
-            path: /var/lib/microshift/resources/kubeadmin/kubeconfig
-            type: FileOrCreate
-          name: kubeconfig
\ No newline at end of file
diff --git a/assets/optional/kube-proxy/kustomization.aarch64.yaml b/assets/optional/kube-proxy/kustomization.aarch64.yaml
deleted file mode 100644
index e62971cbf8..0000000000
--- a/assets/optional/kube-proxy/kustomization.aarch64.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-images:
-  - name: kube-proxy
-    newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:9590a1bb77bdf6ff6f75efd48c1e32bb5a97a00145a5a96b25e8cf03e55f2b98
diff --git a/assets/optional/kube-proxy/kustomization.x86_64.yaml b/assets/optional/kube-proxy/kustomization.x86_64.yaml
deleted file mode 100644
index 32d138dbf7..0000000000
--- a/assets/optional/kube-proxy/kustomization.x86_64.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-images:
-  - name: kube-proxy
-    newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:6aefc3c86fc2beeb3a4b5f9ce5debba753955e5289a3f1c1cf5cd79280fe46ef
diff --git a/assets/optional/kube-proxy/kustomization.yaml b/assets/optional/kube-proxy/kustomization.yaml
deleted file mode 100644
index 67a36b8090..0000000000
--- a/assets/optional/kube-proxy/kustomization.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-  - 00-namespace.yaml
-  - 01-service-account.yaml
-  - 02-cluster-role.yaml
-  - 03-cluster-role-binding.yaml
-  - 04-configmap.yaml
-  - 05-daemonset.yaml
diff --git a/assets/optional/kube-proxy/release-kube-proxy-aarch64.json b/assets/optional/kube-proxy/release-kube-proxy-aarch64.json
deleted file mode 100644
index 700c94352d..0000000000
--- a/assets/optional/kube-proxy/release-kube-proxy-aarch64.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "release": {
-    "base": "4.21.0-0.nightly-arm64-2025-10-13-160412"
-  },
-  "images": {
-    "kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9590a1bb77bdf6ff6f75efd48c1e32bb5a97a00145a5a96b25e8cf03e55f2b98"
-  }
-}
diff --git a/assets/optional/kube-proxy/release-kube-proxy-x86_64.json b/assets/optional/kube-proxy/release-kube-proxy-x86_64.json
deleted file mode 100644
index 95ea85b99b..0000000000
--- a/assets/optional/kube-proxy/release-kube-proxy-x86_64.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "release": {
-    "base": "4.21.0-0.nightly-2025-10-12-115019"
-  },
-  "images": {
-    "kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6aefc3c86fc2beeb3a4b5f9ce5debba753955e5289a3f1c1cf5cd79280fe46ef"
-  }
-}
diff --git a/packaging/crio.conf.d/13-microshift-kindnet.conf b/packaging/crio.conf.d/13-microshift-kindnet.conf
deleted file mode 100644
index 729156bdf3..0000000000
--- a/packaging/crio.conf.d/13-microshift-kindnet.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-[crio.network]
-# The kindnet network name is configured in /etc/cni/net.d/10-kindnet.conflist.
-# By declaring this, CRI-O will wait until that network is up and running.
-cni_default_network = "kindnet"
-
-# Kindnet uses utilities from the containernetworking-plugins package, which
-# must be installed from the AppStream repository on CentOS 9, or from the GitHub
-# release page on CentOS 10 (https://github.com/containernetworking/plugins/releases)
-plugin_dirs = [
-        "/usr/libexec/cni",
-]
diff --git a/packaging/kindnet/00-disableDefaultCNI.yaml b/packaging/kindnet/00-disableDefaultCNI.yaml
deleted file mode 100644
index e368f3a88d..0000000000
--- a/packaging/kindnet/00-disableDefaultCNI.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-network:
-  # CNIPlugin is a user defined string value matching one of the above CNI values. MicroShift uses this
-  # value to decide whether to deploy the OVN-K as default CNI. An unset field defaults to "" during yaml parsing, and thus
-  # could mean that the cluster has been upgraded. In order to support the existing out-of-box behavior, MicroShift
-  # assumes an empty string to mean the OVN-K should be deployed.
-  # Allowed values are: unset or one of ["", "ovnk", "none"]
-  cniPlugin: "none"
diff --git a/packaging/kindnet/microshift-kindnet.service b/packaging/kindnet/microshift-kindnet.service
deleted file mode 100644
index a33b5a3ae8..0000000000
--- a/packaging/kindnet/microshift-kindnet.service
+++ /dev/null
@@ -1,28 +0,0 @@
-[Unit]
-Description=MicroShift
-Wants=network-online.target crio.service
-After=network-online.target crio.service
-
-# Control shutdown order by declaring this service to start Before the kubepods.slice
-# transient systemd unit; this makes system shutdown delay MicroShift shutdown until
-# all the pod containers are down. This is important because some services need to talk
-# to the MicroShift API during shutdown (i.e. releasing leader election locks or cleaning
-# up other resources) MicroShift restart or manual stop will not stop the kubepods.
-Before=kubepods.slice
-
-[Service]
-WorkingDirectory=/usr/bin/
-ExecStart=microshift run
-Restart=always
-User=root
-Type=notify
-Delegate=yes
-CPUAccounting=yes
-BlockIOAccounting=yes
-MemoryAccounting=yes
-LimitNOFILE=1048576
-TimeoutStartSec=4m
-
-[Install]
-WantedBy=multi-user.target
-Also=microshift-cleanup-kubelet.service
diff --git a/packaging/microshift/dropins/disable-storage-csi.yaml b/packaging/microshift/dropins/disable-storage-csi.yaml
deleted file mode 100644
index 424a026876..0000000000
--- a/packaging/microshift/dropins/disable-storage-csi.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-storage:
-    driver: "none"
diff --git a/packaging/rpm/make-rpm.sh b/packaging/rpm/make-rpm.sh
index e9ba30fa11..0ed274807c 100755
--- a/packaging/rpm/make-rpm.sh
+++ b/packaging/rpm/make-rpm.sh
@@ -2,7 +2,7 @@
 set -e -o pipefail
 
 # must be passed down to this script from Makefile
-ENV_VARS="MICROSHIFT_VERSION RPM_RELEASE SOURCE_GIT_TAG SOURCE_GIT_TREE_STATE WITH_KINDNET MICROSHIFT_VARIANT"
+ENV_VARS="MICROSHIFT_VERSION RPM_RELEASE SOURCE_GIT_TAG SOURCE_GIT_TREE_STATE MICROSHIFT_VARIANT"
 for env in ${ENV_VARS} ; do
   if [[ -z "${!env}" ]] ; then
     echo "Error: Mandatory environment variable '${env}' is missing"
@@ -71,7 +71,6 @@ EOF
   rpmbuild --quiet ${RPMBUILD_OPT} \
    --define "_topdir ${RPMBUILD_DIR}" \
    --define "_binary_payload w19T8.zstdio" \
-   --define "with_kindnet ${WITH_KINDNET}" \
    --define "microshift_variant ${MICROSHIFT_VARIANT}" \
    "${RPMBUILD_DIR}"SPECS/microshift.spec
 }
diff --git a/packaging/rpm/microshift.spec b/packaging/rpm/microshift.spec
index 7d49b56453..da015d1f35 100644
--- a/packaging/rpm/microshift.spec
+++ b/packaging/rpm/microshift.spec
@@ -35,8 +35,6 @@
 # Git related details
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
-# Don't build kindnet subpackage by default
-%{!?with_kindnet: %global with_kindnet 0}
 # Enable OCP telemetry by default. Disabled when microshift_variant==community
 %{!?microshift_variant: %global microshift_variant enterprise}
 
@@ -178,28 +176,6 @@ release. These files contain the list of container image references used by
 the Multus CNI for MicroShift and can be used to embed those images into
 osbuilder blueprints or bootc containerfiles.
 
-%if %{with_kindnet}
-%package kindnet
-Summary: kindnet CNI for MicroShift
-ExclusiveArch: x86_64 aarch64
-Requires: microshift = %{version}
-
-%description kindnet
-The microshift-kindnet package provides the required manifests for the kindnet CNI and the dependent
-kube-proxy to be installed on MicroShift.
-
-%package kindnet-release-info
-Summary: Release information for kindnet CNI for MicroShift
-BuildArch: noarch
-Requires: microshift-release-info = %{version}
-
-%description kindnet-release-info
-The microshift-kindnet-release-info package provides release information files for this
-release. These files contain the list of container image references used by the kindnet CNI
-with the dependent kube-proxy for MicroShift and can be used to embed those images
-into osbuilder blueprints or bootc containerfiles.
-%endif
-
 %package low-latency
 Summary: Baseline configuration for running low latency workload on MicroShift
 BuildArch: noarch
@@ -436,49 +412,6 @@ install -p -m755 packaging/crio.conf.d/12-microshift-multus.conf %{buildroot}%{_
 mkdir -p -m755 %{buildroot}%{_datadir}/microshift/release
 install -p -m644 assets/components/multus/release-multus-{x86_64,aarch64}.json %{buildroot}%{_datadir}/microshift/release/
 
-%if %{with_kindnet}
-# kube-proxy
-install -d -m755 %{buildroot}/%{_prefix}/lib/microshift/manifests.d/000-microshift-kube-proxy
-# Copy all the manifests except the arch specific ones
-install -p -m644 assets/optional/kube-proxy/0* %{buildroot}/%{_prefix}/lib/microshift/manifests.d/000-microshift-kube-proxy
-install -p -m644 assets/optional/kube-proxy/kustomization.yaml %{buildroot}/%{_prefix}/lib/microshift/manifests.d/000-microshift-kube-proxy
-
-%ifarch %{arm} aarch64
-cat assets/optional/kube-proxy/kustomization.aarch64.yaml >> %{buildroot}/%{_prefix}/lib/microshift/manifests.d/000-microshift-kube-proxy/kustomization.yaml
-%endif
-
-%ifarch x86_64
-cat assets/optional/kube-proxy/kustomization.x86_64.yaml >> %{buildroot}/%{_prefix}/lib/microshift/manifests.d/000-microshift-kube-proxy/kustomization.yaml
-%endif
-
-# kube-proxy-release-info
-mkdir -p -m755 %{buildroot}%{_datadir}/microshift/release
-install -p -m644 assets/optional/kube-proxy/release-kube-proxy-{x86_64,aarch64}.json %{buildroot}%{_datadir}/microshift/release/
-
-# kindnet
-install -d -m755 %{buildroot}/%{_prefix}/lib/microshift/manifests.d/000-microshift-kindnet
-install -d -m755 %{buildroot}%{_sysconfdir}/systemd/system
-# Copy all the manifests except the arch specific ones
-install -p -m644 assets/optional/kindnet/0* %{buildroot}/%{_prefix}/lib/microshift/manifests.d/000-microshift-kindnet
-install -p -m644 assets/optional/kindnet/kustomization.yaml %{buildroot}/%{_prefix}/lib/microshift/manifests.d/000-microshift-kindnet
-install -p -m644 packaging/kindnet/00-disableDefaultCNI.yaml %{buildroot}%{_sysconfdir}/microshift/config.d/00-disableDefaultCNI.yaml
-install -p -m644 packaging/kindnet/microshift-kindnet.service %{buildroot}%{_sysconfdir}/systemd/system/microshift.service
-install -p -m644 packaging/crio.conf.d/13-microshift-kindnet.conf %{buildroot}%{_sysconfdir}/crio/crio.conf.d/13-microshift-kindnet.conf
-
-
-%ifarch %{arm} aarch64
-cat assets/optional/kindnet/kustomization.aarch64.yaml >> %{buildroot}/%{_prefix}/lib/microshift/manifests.d/000-microshift-kindnet/kustomization.yaml
-%endif
-
-%ifarch x86_64
-cat assets/optional/kindnet/kustomization.x86_64.yaml >> %{buildroot}/%{_prefix}/lib/microshift/manifests.d/000-microshift-kindnet/kustomization.yaml
-%endif
-
-# kindnet-release-info
-mkdir -p -m755 %{buildroot}%{_datadir}/microshift/release
-install -p -m644 assets/optional/kindnet/release-kindnet-{x86_64,aarch64}.json %{buildroot}%{_datadir}/microshift/release/
-%endif
-
 # cleanup kubelet
 install -p -m644 packaging/tuned/microshift-cleanup-kubelet.service %{buildroot}%{_unitdir}/microshift-cleanup-kubelet.service
 
@@ -730,21 +663,6 @@ fi
 %files multus-release-info
 %{_datadir}/microshift/release/release-multus-{x86_64,aarch64}.json
 
-%if %{with_kindnet}
-%files kindnet
-%dir %{_prefix}/lib/microshift/manifests.d/000-microshift-kindnet
-%dir %{_prefix}/lib/microshift/manifests.d/000-microshift-kube-proxy
-%{_prefix}/lib/microshift/manifests.d/000-microshift-kindnet/*
-%{_prefix}/lib/microshift/manifests.d/000-microshift-kube-proxy/*
-%config(noreplace) %{_sysconfdir}/microshift/config.d/00-disableDefaultCNI.yaml
-%{_sysconfdir}/systemd/system/microshift.service
-%{_sysconfdir}/crio/crio.conf.d/13-microshift-kindnet.conf
-
-%files kindnet-release-info
-%{_datadir}/microshift/release/release-kindnet-{x86_64,aarch64}.json
-%{_datadir}/microshift/release/release-kube-proxy-{x86_64,aarch64}.json
-%endif
-
 %files low-latency
 %{_prefix}/lib/tuned/microshift-baseline
 %config(noreplace) %{_sysconfdir}/tuned/microshift-baseline-variables.conf
diff --git a/scripts/auto-rebase/assets.yaml b/scripts/auto-rebase/assets.yaml
index d62c9bb386..94730dc786 100644
--- a/scripts/auto-rebase/assets.yaml
+++ b/scripts/auto-rebase/assets.yaml
@@ -273,35 +273,6 @@ assets:
       - file: release-multus-aarch64.json
       - file: release-multus-x86_64.json
 
-  - dir: optional/kindnet/
-    ignore: "they don't exist in upstream repository - only in microshift"
-    files:
-      - file: kustomization.yaml
-      - file: kustomization.aarch64.yaml
-      - file: kustomization.x86_64.yaml
-      - file: 00-namespace.yaml
-      - file: 01-service-account.yaml
-      - file: 02-cluster-role.yaml
-      - file: 03-cluster-role-binding.yaml
-      - file: 04-daemonset.yaml
-      - file: release-kindnet-aarch64.json
-      - file: release-kindnet-x86_64.json
-
-  - dir: optional/kube-proxy/
-    ignore: "they don't exist in upstream repository - only in microshift"
-    files:
-      - file: kustomization.yaml
-      - file: kustomization.aarch64.yaml
-      - file: kustomization.x86_64.yaml
-      - file: 00-namespace.yaml
-      - file: 01-service-account.yaml
-      - file: 02-cluster-role.yaml
-      - file: 03-cluster-role-binding.yaml
-      - file: 04-configmap.yaml
-      - file: 05-daemonset.yaml
-      - file: release-kube-proxy-aarch64.json
-      - file: release-kube-proxy-x86_64.json
-
   - dir: optional/observability/
     ignore: "they don't exist in upstream repository - only in microshift"
     files:
diff --git a/scripts/auto-rebase/rebase.sh b/scripts/auto-rebase/rebase.sh
index 7eaacb5740..0224bfdea4 100755
--- a/scripts/auto-rebase/rebase.sh
+++ b/scripts/auto-rebase/rebase.sh
@@ -884,7 +884,6 @@ EOF
 
     update_olm_images
     update_multus_images
-    update_kubeproxy_images
 
     popd >/dev/null
 }
@@ -1187,44 +1186,6 @@ EOF
     done  # for goarch
 }
 
-update_kubeproxy_images() {
-    title "Rebasing kube-proxy images"
-
-    for goarch in amd64 arm64; do
-        arch=${GOARCH_TO_UNAME_MAP["${goarch}"]:-noarch}
-
-        local release_file="${STAGING_DIR}/release_${goarch}.json"
-        local kustomization_arch_file="${REPOROOT}/assets/optional/kube-proxy/kustomization.${arch}.yaml"
-        local kubeproxy_release_json="${REPOROOT}/assets/optional/kube-proxy/release-kube-proxy-${arch}.json"
-
-        local base_release
-        base_release=$(jq -r ".metadata.version" "${release_file}")
-        jq -n "{\"release\": {\"base\": \"$base_release\"}, \"images\": {}}" > "${kubeproxy_release_json}"
-
-        # Create extra kustomization for each arch in separate file.
-        # Right file (depending on arch) should be appended during rpmbuild to kustomization.yaml.
-        cat <<EOF > "${kustomization_arch_file}"
-
-images:
-EOF
-
-        for container in kube-proxy; do
-            local new_image
-            new_image=$(jq -r ".references.spec.tags[] | select(.name == \"${container}\") | .from.name" "${release_file}")
-            local new_image_name="${new_image%@*}"
-            local new_image_digest="${new_image#*@}"
-
-            cat <<EOF >> "${kustomization_arch_file}"
-  - name: ${container}
-    newName: ${new_image_name}
-    digest: ${new_image_digest}
-EOF
-
-            yq -i -o json ".images += {\"${container}\": \"${new_image}\"}" "${kubeproxy_release_json}"
-        done  # for container
-    done  # for goarch
-}
-
 check_for_manifests_changes() {
     # Changes to ignore:
     # - `release-$ARCH.json` files
diff --git a/test/bin/build_rpms.sh b/test/bin/build_rpms.sh
index 03c4dcfc33..785cbff52a 100755
--- a/test/bin/build_rpms.sh
+++ b/test/bin/build_rpms.sh
@@ -6,8 +6,6 @@
 set -euo pipefail
 
 SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-# Build the kindnet RPM unless overridden explicitly
-WITH_KINDNET=${WITH_KINDNET:-1}
 
 # shellcheck source=test/bin/common.sh
 source "${SCRIPTDIR}/common.sh"
@@ -18,11 +16,11 @@ build_rpms() {
     rm -rf _output/rpmbuild*
 
     # Normal build of current branch from source
-    local build_cmds=("make WITH_KINDNET=${WITH_KINDNET} rpm")
+    local build_cmds=("make rpm")
 
     # In CI, build the current branch from source with the build tools using used by OCP
     if [ -v CI_JOB_NAME ]; then
-        build_cmds=("make WITH_KINDNET=${WITH_KINDNET} rpm-podman")
+        build_cmds=("make rpm-podman")
     fi
 
     build_cmds+=(
diff --git a/test/image-blueprints-bootc/layer4-upstream/group2/cos10-bootc-source-kindnet.containerfile b/test/image-blueprints-bootc/layer4-upstream/group2/cos10-bootc-source-kindnet.containerfile
deleted file mode 100644
index 127ad3c4ac..0000000000
--- a/test/image-blueprints-bootc/layer4-upstream/group2/cos10-bootc-source-kindnet.containerfile
+++ /dev/null
@@ -1,43 +0,0 @@
-FROM localhost/cos10-bootc-source:latest
-
-# Build arguments
-ARG USHIFT_RPM_REPO_NAME=microshift-local
-ARG USHIFT_RPM_REPO_PATH=/tmp/$USHIFT_RPM_REPO_NAME
-
-# Copy the MicroShift repository contents
-COPY ./rpm-repos/$USHIFT_RPM_REPO_NAME $USHIFT_RPM_REPO_PATH
-
-# Copy repository configuration
-COPY ./bootc-images/$USHIFT_RPM_REPO_NAME.repo ./bootc-images/microshift-centos10-nfv.repo ./bootc-images/microshift-rhocp-y.repo \
-    /etc/yum.repos.d/
-
-# Print repository configuration contents.
-# Install MicroShift optional packages and cleanup.
-RUN dnf repoinfo --enabled && \
-    dnf install -y "microshift-kindnet-{{ env.Getenv "SOURCE_VERSION" }}" && \
-    rm -vf /etc/yum.repos.d/microshift-*.repo && \
-    rm -rvf $USHIFT_RPM_REPO_PATH && \
-    dnf clean all
-
-# Kindnet depends on containernetworking-plugins, which is not available in the
-# CentOS 10 repositories. Install it from the package GitHub release page.
-RUN /bin/bash <<'EOF'
-    set -euo pipefail
-    set -x
-    # Set the package version and name
-    CNP_VER=v1.8.0
-    CNP_PKG="cni-plugins-linux-amd64-${CNP_VER}.tgz"
-    [ "$(uname -m)" = "aarch64" ] && CNP_PKG="cni-plugins-linux-arm64-${CNP_VER}.tgz"
-
-    # Download the package
-    curl -sSL --retry 5 -o "/tmp/${CNP_PKG}" \
-        "https://github.com/containernetworking/plugins/releases/download/${CNP_VER}/${CNP_PKG}"
-
-    # Extract the package into the CNI plugins directory as defined 
-    # in the crio.conf.d/13-microshift-kindnet.conf file.
-    mkdir -p /usr/libexec/cni
-    tar zxvf "/tmp/${CNP_PKG}" -C /usr/libexec/cni && \
-
-    # Clean up
-    rm -f "/tmp/${CNP_PKG}"
-EOF
diff --git a/test/image-blueprints-bootc/layer4-upstream/group2/cos9-bootc-source-kindnet.containerfile b/test/image-blueprints-bootc/layer4-upstream/group2/cos9-bootc-source-kindnet.containerfile
deleted file mode 100644
index 1cd01eadc4..0000000000
--- a/test/image-blueprints-bootc/layer4-upstream/group2/cos9-bootc-source-kindnet.containerfile
+++ /dev/null
@@ -1,20 +0,0 @@
-FROM localhost/cos9-bootc-source:latest
-
-# Build arguments
-ARG USHIFT_RPM_REPO_NAME=microshift-local
-ARG USHIFT_RPM_REPO_PATH=/tmp/$USHIFT_RPM_REPO_NAME
-
-# Copy the MicroShift repository contents
-COPY ./rpm-repos/$USHIFT_RPM_REPO_NAME $USHIFT_RPM_REPO_PATH
-
-# Copy repository configuration
-COPY ./bootc-images/$USHIFT_RPM_REPO_NAME.repo ./bootc-images/microshift-centos9-nfv.repo ./bootc-images/microshift-rhocp-y.repo \
-    /etc/yum.repos.d/
-
-# Print repository configuration contents.
-# Install MicroShift optional packages and cleanup.
-RUN dnf repoinfo --enabled && \
-    dnf install -y "microshift-kindnet-{{ env.Getenv "SOURCE_VERSION" }}" && \
-    rm -vf /etc/yum.repos.d/microshift-*.repo && \
-    rm -rvf $USHIFT_RPM_REPO_PATH && \
-    dnf clean all
diff --git a/test/scenarios-bootc/upstream/cos10-src@kindnet.sh b/test/scenarios-bootc/upstream/cos10-src@kindnet.sh
deleted file mode 100644
index 8e8d47832e..0000000000
--- a/test/scenarios-bootc/upstream/cos10-src@kindnet.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-# Sourced from scenario.sh and uses functions defined there.
-
-scenario_create_vms() {
-    prepare_kickstart host1 kickstart-bootc.ks.template cos10-bootc-source-kindnet
-    launch_vm --boot_blueprint centos10-bootc
-}
-
-scenario_remove_vms() {
-    remove_vm host1
-}
-
-scenario_run_tests() {
-    run_tests host1 suites/standard1/networking-smoke.robot
-}
diff --git a/test/scenarios-bootc/upstream/cos9-src@kindnet.sh b/test/scenarios-bootc/upstream/cos9-src@kindnet.sh
deleted file mode 100644
index 604a324728..0000000000
--- a/test/scenarios-bootc/upstream/cos9-src@kindnet.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-# Sourced from scenario.sh and uses functions defined there.
-
-scenario_create_vms() {
-    prepare_kickstart host1 kickstart-bootc.ks.template cos9-bootc-source-kindnet
-    launch_vm --boot_blueprint centos9-bootc
-}
-
-scenario_remove_vms() {
-    remove_vm host1
-}
-
-scenario_run_tests() {
-    run_tests host1 suites/standard1/networking-smoke.robot
-}