diff --git a/api/v1alpha1/conditions_const.go b/api/v1alpha1/conditions_const.go
index 8f138c7f2..2ea78dbf4 100644
--- a/api/v1alpha1/conditions_const.go
+++ b/api/v1alpha1/conditions_const.go
@@ -110,6 +110,9 @@ const (
 
 	// GitTokenOrEnvVariableNotSetReason is used when user don't specify the token or environment variable.
 	GitTokenOrEnvVariableNotSetReason = "GitTokenOrEnvVariableNotSet" //#nosec
+
+	// FailedCreateGithubClientReason is used when user don't specify the token or environment variable.
+	FailedCreateGithubClientReason = "FailedCreateGithubClient" //#nosec
 )
 
 const (
diff --git a/cmd/main.go b/cmd/main.go
index 17223f4c5..3f40f76c7 100644
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -161,6 +161,7 @@ func main() {
 		WatchFilterValue:       watchFilterValue,
 		KubeClientFactory:      kube.NewFactory(),
 		WorkloadClusterFactory: workloadcluster.NewFactory(),
+		GitHubClientFactory:    gitFactory,
 	}).SetupWithManager(ctx, mgr, controllerruntimecontroller.Options{MaxConcurrentReconciles: clusterAddonConcurrency}); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "ClusterAddon")
 		os.Exit(1)
diff --git a/internal/controller/clusteraddon_controller.go b/internal/controller/clusteraddon_controller.go
index 1748b7c59..ca8daf6fc 100644
--- a/internal/controller/clusteraddon_controller.go
+++ b/internal/controller/clusteraddon_controller.go
@@ -29,14 +29,17 @@ import (
 	"path/filepath"
 	"reflect"
 	"strings"
+	"sync"
 	"text/template"
 	"time"
 
 	csov1alpha1 "github.com/SovereignCloudStack/cluster-stack-operator/api/v1alpha1"
 	"github.com/SovereignCloudStack/cluster-stack-operator/pkg/clusteraddon"
+	githubclient "github.com/SovereignCloudStack/cluster-stack-operator/pkg/github/client"
 	"github.com/SovereignCloudStack/cluster-stack-operator/pkg/kube"
 	"github.com/SovereignCloudStack/cluster-stack-operator/pkg/release"
 	"github.com/SovereignCloudStack/cluster-stack-operator/pkg/workloadcluster"
+	"github.com/go-logr/logr"
 	sprig "github.com/go-task/slim-sprig"
 	"github.com/google/cel-go/cel"
 	celtypes "github.com/google/cel-go/common/types"
@@ -63,6 +66,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/event"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
+	"sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	"sigs.k8s.io/controller-runtime/pkg/source"
@@ -80,10 +84,12 @@ type RestConfigSettings struct {
 type ClusterAddonReconciler struct {
 	client.Client
 	RestConfigSettings
-	ReleaseDirectory       string
-	KubeClientFactory      kube.Factory
-	WatchFilterValue       string
-	WorkloadClusterFactory workloadcluster.Factory
+	ReleaseDirectory                      string
+	KubeClientFactory                     kube.Factory
+	GitHubClientFactory                   githubclient.Factory
+	WatchFilterValue                      string
+	WorkloadClusterFactory                workloadcluster.Factory
+	clusterStackRelDownloadDirectoryMutex sync.Mutex
 }
 
 //+kubebuilder:rbac:groups=clusterstack.x-k8s.io,resources=clusteraddons,verbs=get;list;watch;create;update;patch;delete
@@ -207,6 +213,8 @@ func (r *ClusterAddonReconciler) Reconcile(ctx context.Context, req reconcile.Re
 		return reconcile.Result{}, fmt.Errorf("failed to get cluster addon config path: %w", err)
 	}
 
+	logger := log.FromContext(ctx)
+
 	// Check whether current Helm chart has been applied in the workload cluster. If not, then we need to apply the helm chart (again).
 	// the spec.clusterStack is only set after a Helm chart from a ClusterStack has been applied successfully.
 	// If it is not set, the Helm chart has never been applied.
@@ -270,6 +278,31 @@ func (r *ClusterAddonReconciler) Reconcile(ctx context.Context, req reconcile.Re
 		return ctrl.Result{}, nil
 
 	} else {
+		in.addonStagesInput, err = r.getAddonStagesInput(clusterAddon, in.restConfig, in.clusterAddonChartPath)
+		if err != nil {
+			return reconcile.Result{}, fmt.Errorf("failed to get addon stages input: %w", err)
+		}
+
+		if clusterAddon.Spec.ClusterStack != "" {
+			oldClusterStackAddonChartPath, requeue, err := r.downloadOldClusterStackRelease(ctx, clusterAddon, logger)
+			if err != nil {
+				return reconcile.Result{}, fmt.Errorf("failed to download old cluster stack releases: %w", err)
+			}
+			if requeue {
+				return reconcile.Result{RequeueAfter: 10 * time.Second}, nil
+			}
+
+			// src - /tmp/cluster-stacks/docker-ferrol-1-27-v1/docker-ferrol-1-27-cluster-addon-v1.tgz
+			// dst - /tmp/cluster-stacks/docker-ferrol-1-27-v1/docker-ferrol-1-27-cluster-addon-v1/
+			in.oldDestinationClusterAddonChartDir = strings.TrimSuffix(oldClusterStackAddonChartPath, ".tgz")
+
+			logger.Info("old cluster stack's cluster addon chart path", "path", in.oldDestinationClusterAddonChartDir)
+
+			if err := unTarContent(oldClusterStackAddonChartPath, in.oldDestinationClusterAddonChartDir); err != nil {
+				return reconcile.Result{}, fmt.Errorf("failed to untar cluster addon chart: %q: %w", oldClusterStackAddonChartPath, err)
+			}
+		}
+
 		if clusterAddon.Spec.Hook != clusterAddon.Status.CurrentHook {
 			clusterAddon.Status.HelmChartStatus = make(map[string]csov1alpha1.HelmChartStatusConditions)
 			clusterAddon.Status.CurrentHook = clusterAddon.Spec.Hook
@@ -297,11 +330,6 @@ func (r *ClusterAddonReconciler) Reconcile(ctx context.Context, req reconcile.Re
 			return reconcile.Result{}, nil
 		}
 
-		in.addonStagesInput, err = getAddonStagesInput(r, in.restConfig, in.clusterAddonChartPath)
-		if err != nil {
-			return reconcile.Result{}, fmt.Errorf("failed to get addon stages input: %w", err)
-		}
-
 		// clusteraddon.yaml in the release.
 		clusterAddonConfig, err := clusteraddon.ParseClusterAddonConfig(in.clusterAddonConfigPath)
 		if err != nil {
@@ -394,14 +422,15 @@ type templateAndApplyClusterAddonInput struct {
 }
 
 type addonStagesInput struct {
-	kubeClient                      kube.Client
-	dynamicClient                   *dynamic.DynamicClient
-	discoverClient                  *discovery.DiscoveryClient
-	chartMap                        map[string]os.DirEntry
-	destinationClusterAddonChartDir string
+	kubeClient                         kube.Client
+	dynamicClient                      *dynamic.DynamicClient
+	discoverClient                     *discovery.DiscoveryClient
+	chartMap                           map[string]os.DirEntry
+	newDestinationClusterAddonChartDir string
+	oldDestinationClusterAddonChartDir string
 }
 
-func getAddonStagesInput(r *ClusterAddonReconciler, restConfig *rest.Config, clusterAddonChart string) (addonStagesInput, error) {
+func (r *ClusterAddonReconciler) getAddonStagesInput(clusterAddon *csov1alpha1.ClusterAddon, restConfig *rest.Config, clusterAddonChart string) (addonStagesInput, error) {
 	var (
 		addonStages addonStagesInput
 		err         error
@@ -420,15 +449,15 @@ func getAddonStagesInput(r *ClusterAddonReconciler, restConfig *rest.Config, clu
 
 	// src - /tmp/cluster-stacks/docker-ferrol1-27-v1/docker-ferrol-27-cluster-addon-v1.tgz
 	// dst - /tmp/cluster-stacks/docker-ferrol-1-27-v1/docker-ferrol-1-27-cluster-addon-v1/
-	addonStages.destinationClusterAddonChartDir = strings.TrimSuffix(clusterAddonChart, ".tgz")
-	if err := unTarContent(clusterAddonChart, addonStages.destinationClusterAddonChartDir); err != nil {
+	addonStages.newDestinationClusterAddonChartDir = strings.TrimSuffix(clusterAddonChart, ".tgz")
+	if err := unTarContent(clusterAddonChart, addonStages.newDestinationClusterAddonChartDir); err != nil {
 		return addonStagesInput{}, fmt.Errorf("failed to untar cluster addon chart: %q: %w", clusterAddonChart, err)
 	}
 
 	// Read all the helm charts in the un-tared cluster addon.
-	subDirs, err := os.ReadDir(addonStages.destinationClusterAddonChartDir)
+	subDirs, err := os.ReadDir(addonStages.newDestinationClusterAddonChartDir)
 	if err != nil {
-		return addonStagesInput{}, fmt.Errorf("failed to read directories inside: %q: %w", addonStages.destinationClusterAddonChartDir, err)
+		return addonStagesInput{}, fmt.Errorf("failed to read directories inside: %q: %w", addonStages.newDestinationClusterAddonChartDir, err)
 	}
 
 	// Create a map for faster lookup
@@ -468,9 +497,7 @@ func (r *ClusterAddonReconciler) templateAndApplyClusterAddonHelmChart(ctx conte
 
 func (r *ClusterAddonReconciler) executeStage(ctx context.Context, stage clusteraddon.Stage, in templateAndApplyClusterAddonInput) (bool, error) {
 	var (
-		newResources  []*csov1alpha1.Resource
 		shouldRequeue bool
-		buildTemplate []byte
 		err           error
 	)
 
@@ -516,7 +543,7 @@ check:
 
 	case csov1alpha1.ApplyingOrDeleting:
 		if stage.Action == clusteraddon.Apply {
-			newResources, shouldRequeue, err = helmTemplateAndApply(ctx, in.kubeClient, in, stage.HelmChartName, buildTemplate, false)
+			shouldRequeue, err = helmTemplateAndApplyNewClusterStack(ctx, in, stage.HelmChartName)
 			if err != nil {
 				return false, fmt.Errorf("failed to helm template and apply: %w", err)
 			}
@@ -531,12 +558,13 @@ check:
 
 				return true, nil
 			}
+
 			in.clusterAddon.Status.HelmChartStatus[stage.HelmChartName] = csov1alpha1.WaitingForPostCondition
 			goto check
 
 		} else {
 			// Delete part
-			newResources, shouldRequeue, err = helmTemplateAndDelete(ctx, in, stage.HelmChartName, buildTemplate)
+			shouldRequeue, err = helmTemplateAndDeleteNewClusterStack(ctx, in, stage.HelmChartName)
 			if err != nil {
 				return false, fmt.Errorf("failed to delete helm chart: %w", err)
 			}
@@ -571,20 +599,154 @@ check:
 
 					return true, nil
 				}
-				return false, fmt.Errorf("failed to get dynamic resource and evaluate cel expression for pre condition: %w", err)
+				return false, fmt.Errorf("failed to get dynamic resource and evaluate cel expression for post condition: %w", err)
 			}
 		}
 		in.clusterAddon.Status.HelmChartStatus[stage.HelmChartName] = csov1alpha1.Done
 	}
 
-	in.clusterAddon.Status.Resources = append(in.clusterAddon.Status.Resources, newResources...)
-
 	return false, nil
 }
 
+// downloadOldClusterStackRelease downloads the old cluster stack if not present and returns release clusterAddon chart path if requeue and error.
+func (r *ClusterAddonReconciler) downloadOldClusterStackRelease(ctx context.Context, clusterAddon *csov1alpha1.ClusterAddon, logger logr.Logger) (string, bool, error) {
+	// initiate github release.
+	gc, err := r.GitHubClientFactory.NewClient(ctx)
+	if err != nil {
+		isSet := conditions.IsFalse(clusterAddon, csov1alpha1.GitAPIAvailableCondition)
+		conditions.MarkFalse(clusterAddon,
+			csov1alpha1.GitAPIAvailableCondition,
+			csov1alpha1.FailedCreateGithubClientReason,
+			clusterv1.ConditionSeverityError,
+			err.Error(),
+		)
+		record.Warnf(clusterAddon, "FailedCreateGithubClient", err.Error())
+
+		// give the github client a second change
+		if isSet {
+			return "", true, nil
+		}
+		return "", false, nil
+	}
+
+	conditions.MarkTrue(clusterAddon, csov1alpha1.GitAPIAvailableCondition)
+	logger.Info("github client initialized")
+
+	// check if old cluster stack release is present or not.
+	releaseAsset, download, err := release.New(release.ConvertFromClusterClassToClusterStackFormat(clusterAddon.Spec.ClusterStack), r.ReleaseDirectory)
+	if err != nil {
+		conditions.MarkFalse(clusterAddon, csov1alpha1.ClusterStackReleaseAssetsReadyCondition, csov1alpha1.IssueWithReleaseAssetsReason, clusterv1.ConditionSeverityError, err.Error())
+		return "", true, nil
+	}
+	if download {
+		logger.Info("the old cluster stack is not present", "clusterstack", clusterAddon.Spec.ClusterStack)
+		// if download is true, it means that the release assets have not been downloaded yet
+
+		conditions.MarkFalse(clusterAddon, csov1alpha1.ClusterStackReleaseAssetsReadyCondition, csov1alpha1.ReleaseAssetsNotDownloadedYetReason, clusterv1.ConditionSeverityInfo, "assets not downloaded yet")
+
+		// this is the point where we download the release from github
+		// acquire lock so that only one reconcile loop can download the release
+		r.clusterStackRelDownloadDirectoryMutex.Lock()
+
+		if err := downloadReleaseAssets(ctx, release.ConvertFromClusterClassToClusterStackFormat(clusterAddon.Spec.ClusterStack), releaseAsset.LocalDownloadPath, gc); err != nil {
+			return "", false, fmt.Errorf("failed to download release assets: %w", err)
+		}
+
+		r.clusterStackRelDownloadDirectoryMutex.Unlock()
+
+		// requeue to make sure release assets can be accessed
+		return "", true, nil
+	}
+
+	if err := releaseAsset.CheckHelmCharts(); err != nil {
+		msg := fmt.Sprintf("failed to validate helm charts: %s", err.Error())
+		conditions.MarkFalse(
+			clusterAddon,
+			csov1alpha1.ClusterStackReleaseAssetsReadyCondition,
+			csov1alpha1.IssueWithReleaseAssetsReason,
+			clusterv1.ConditionSeverityError,
+			msg,
+		)
+		record.Warnf(clusterAddon, "ValidateHelmChartFailed", msg)
+		return "", false, nil
+	}
+
+	// set downloaded condition if able to read metadata file
+	conditions.MarkTrue(clusterAddon, csov1alpha1.ClusterStackReleaseAssetsReadyCondition)
+
+	return releaseAsset.ClusterAddonChartPath(), false, nil
+}
+
+func helmTemplateAndApplyNewClusterStack(ctx context.Context, in templateAndApplyClusterAddonInput, helmChartName string) (bool, error) {
+	logger := log.FromContext(ctx)
+
+	var (
+		buildTemplate   []byte
+		oldHelmTemplate []byte
+		err             error
+	)
+
+	if in.oldDestinationClusterAddonChartDir != "" {
+		oldClusterStackSubDirPath := filepath.Join(in.oldDestinationClusterAddonChartDir, helmChartName)
+		oldHelmTemplate, err = helmTemplateClusterAddon(oldClusterStackSubDirPath, buildTemplate, true)
+		if err != nil {
+			return false, fmt.Errorf("failed to template old helm chart: %w", err)
+		}
+		logger.Info("oldClusterStackAddonChartPath v1", "path", oldClusterStackSubDirPath)
+	}
+
+	newClusterStackSubDirPath := filepath.Join(in.newDestinationClusterAddonChartDir, helmChartName)
+	newHelmTemplate, err := helmTemplateClusterAddon(newClusterStackSubDirPath, buildTemplate, true)
+	if err != nil {
+		return false, fmt.Errorf("failed to template new helm chart: %w", err)
+	}
+	logger.Info("newClusterStackSubDirPath v1", "path", newClusterStackSubDirPath)
+
+	shouldRequeue, err := in.kubeClient.ApplyNewClusterStack(ctx, oldHelmTemplate, newHelmTemplate)
+	if err != nil {
+		return false, fmt.Errorf("failed to apply objects from cluster addon Helm chart: %w", err)
+	}
+
+	return shouldRequeue, nil
+}
+
+func helmTemplateAndDeleteNewClusterStack(ctx context.Context, in templateAndApplyClusterAddonInput, helmChartName string) (bool, error) {
+	// logger := log.FromContext(ctx)
+	var (
+		buildTemplate []byte
+		// oldHelmTemplate []byte
+		err error
+	)
+
+	// if in.oldDestinationClusterAddonChartDir != "" {
+	// 	oldClusterStackSubDirPath := filepath.Join(in.oldDestinationClusterAddonChartDir, helmChartName)
+	// 	oldHelmTemplate, err = helmTemplateClusterAddon(oldClusterStackSubDirPath, buildTemplate, true)
+	// 	if err != nil {
+	// 		return false, fmt.Errorf("failed to template old helm chart: %w", err)
+	// 	}
+	// 	logger.Info("oldClusterStackAddonChartPath v1", "path", oldClusterStackSubDirPath)
+	// }
+
+	newClusterStackSubDirPath := filepath.Join(in.newDestinationClusterAddonChartDir, helmChartName)
+	newHelmTemplate, err := helmTemplateClusterAddon(newClusterStackSubDirPath, buildTemplate, true)
+	if err != nil {
+		return false, fmt.Errorf("failed to template new helm chart: %w", err)
+	}
+	// logger.Info("newClusterStackSubDirPath v1", "path", newClusterStackSubDirPath)
+
+	shouldRequeue, err := in.kubeClient.DeleteNewClusterStack(ctx, newHelmTemplate)
+	if err != nil {
+		return false, fmt.Errorf("failed to delete objects from cluster addon Helm chart: %w", err)
+	}
+
+	return shouldRequeue, nil
+}
+
 func helmTemplateAndApply(ctx context.Context, kubeClient kube.Client, in templateAndApplyClusterAddonInput, helmChartName string, buildTemplate []byte, shouldDelete bool) ([]*csov1alpha1.Resource, bool, error) {
-	subDirPath := filepath.Join(in.destinationClusterAddonChartDir, helmChartName)
+	subDirPath := filepath.Join(in.newDestinationClusterAddonChartDir, helmChartName)
+	loggger := log.FromContext(ctx)
 
+	loggger.Info("path of the subdir", "path", subDirPath)
 	helmTemplate, err := helmTemplateClusterAddon(subDirPath, buildTemplate, true)
 	if err != nil {
 		return nil, false, fmt.Errorf("failed to template helm chart: %w", err)
@@ -599,7 +761,7 @@ func helmTemplateAndApply(ctx context.Context, kubeClient kube.Client, in templa
 }
 
 func helmTemplateAndDelete(ctx context.Context, in templateAndApplyClusterAddonInput, helmChartName string, buildTemplate []byte) ([]*csov1alpha1.Resource, bool, error) {
-	subDirPath := filepath.Join(in.destinationClusterAddonChartDir, helmChartName)
+	subDirPath := filepath.Join(in.newDestinationClusterAddonChartDir, helmChartName)
 
 	helmTemplate, err := helmTemplateClusterAddon(subDirPath, buildTemplate, true)
 	if err != nil {
diff --git a/pkg/kube/fake/kube.go b/pkg/kube/fake/kube.go
new file mode 100644
index 000000000..de4f94cf6
--- /dev/null
+++ b/pkg/kube/fake/kube.go
@@ -0,0 +1,59 @@
+/*
+Copyright 2023 The Kubernetes Authors.
+
+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.
+*/
+
+// Package fake implements important interface like kube client.
+package fake
+
+import (
+	"context"
+
+	csov1alpha1 "github.com/SovereignCloudStack/cluster-stack-operator/api/v1alpha1"
+	kubeclient "github.com/SovereignCloudStack/cluster-stack-operator/pkg/kube"
+	"k8s.io/client-go/rest"
+)
+
+// kube is the struct for kube client.
+type kube struct{}
+
+type factory struct{}
+
+// NewClient gives reference to the fake yaml client.
+func (*factory) NewClient(_ string, _ *rest.Config) kubeclient.Client {
+	return &kube{}
+}
+
+// NewFactory creates new fake kube client factories.
+func NewFactory() kubeclient.Factory {
+	return &factory{}
+}
+
+// Apply applies the given yaml object.
+func (*kube) Apply(_ context.Context, _ []byte, _ []*csov1alpha1.Resource, _ bool) (_ []*csov1alpha1.Resource, _ bool, _ error) {
+	return nil, false, nil
+}
+
+// Delete deletes the given yaml object.
+func (*kube) Delete(_ context.Context, _ []byte, _ []*csov1alpha1.Resource) (_ []*csov1alpha1.Resource, _ bool, _ error) {
+	return nil, false, nil
+}
+
+func (*kube) ApplyNewClusterStack(_ context.Context, _, _ []byte) (_ bool, _ error) {
+	return false, nil
+}
+
+func (*kube) DeleteNewClusterStack(_ context.Context, _ []byte) (_ bool, _ error) {
+	return false, nil
+}
diff --git a/pkg/kube/helpers.go b/pkg/kube/helpers.go
index e0fcfbdff..2ed87b32c 100644
--- a/pkg/kube/helpers.go
+++ b/pkg/kube/helpers.go
@@ -114,6 +114,16 @@ func getResourceMap(resources []*csov1alpha1.Resource) map[types.NamespacedName]
 	return resourceMap
 }
 
+func getResourceMapOfUnstructuredObjects(objects []*unstructured.Unstructured) map[types.NamespacedName]*unstructured.Unstructured {
+	objectMap := make(map[types.NamespacedName]*unstructured.Unstructured)
+
+	for i, object := range objects {
+		objectMap[types.NamespacedName{Name: object.GetName(), Namespace: object.GetNamespace()}] = objects[i]
+	}
+
+	return objectMap
+}
+
 func setLabel(target *unstructured.Unstructured, key, val string) error {
 	labels, _, err := unstructured.NestedStringMap(target.Object, "metadata", "labels")
 	if err != nil {
@@ -235,6 +245,29 @@ func resourcesToBeDeleted(oldResources []*csov1alpha1.Resource, currentObjs []*u
 	return toBeDeleted
 }
 
+func resourcesToBeDeletedFromUnstructuredObjects(oldObjects, newObjects []*unstructured.Unstructured) []*unstructured.Unstructured {
+	toBeDeleted := make([]*unstructured.Unstructured, 0, len(oldObjects))
+
+	newObjectMap := make(map[types.NamespacedName]struct{})
+	for _, newObj := range newObjects {
+		newObjectMap[types.NamespacedName{Name: newObj.GetName(), Namespace: newObj.GetNamespace()}] = struct{}{}
+	}
+
+	for i, oldObj := range oldObjects {
+		nameSpacedName := types.NamespacedName{
+			Name:      oldObj.GetName(),
+			Namespace: oldObj.GetNamespace(),
+		}
+
+		// delete resources that are not listed in the new objects anymore
+		if _, found := newObjectMap[nameSpacedName]; !found {
+			toBeDeleted = append(toBeDeleted, oldObjects[i])
+		}
+	}
+
+	return toBeDeleted
+}
+
 func deleteObject(kubeClientset kubernetes.Interface, namespace string, restConfig *rest.Config, obj runtime.Object) error {
 	// Create a REST mapper that tracks information about the available resources in the cluster.
 	groupResources, err := restmapper.GetAPIGroupResources(kubeClientset.Discovery())
diff --git a/pkg/kube/kube.go b/pkg/kube/kube.go
index a5d5bba83..19807435b 100644
--- a/pkg/kube/kube.go
+++ b/pkg/kube/kube.go
@@ -39,6 +39,9 @@ type kube struct {
 type Client interface {
 	Apply(ctx context.Context, template []byte, oldResources []*csov1alpha1.Resource, shouldDelete bool) (newResources []*csov1alpha1.Resource, shouldRequeue bool, err error)
 	Delete(ctx context.Context, template []byte, oldResources []*csov1alpha1.Resource) (newResources []*csov1alpha1.Resource, shouldRequeue bool, err error)
+
+	ApplyNewClusterStack(ctx context.Context, oldTemplate, newTemplate []byte) (shouldRequeue bool, err error)
+	DeleteNewClusterStack(ctx context.Context, template []byte) (shouldRequeue bool, err error)
 }
 
 // Factory creates new fake kube client factories.
@@ -64,6 +67,108 @@ func (*factory) NewClient(namespace string, resCfg *rest.Config) Client {
 	}
 }
 
+func (k *kube) ApplyNewClusterStack(ctx context.Context, oldTemplate, newTemplate []byte) (shouldRequeue bool, err error) {
+	logger := log.FromContext(ctx)
+
+	oldObjects, err := parseK8sYaml(oldTemplate)
+	if err != nil {
+		return false, fmt.Errorf("failed to parse old cluster stack template: %w", err)
+	}
+	logger.Info("oldObjects value", "val", oldObjects)
+
+	newObjects, err := parseK8sYaml(newTemplate)
+	if err != nil {
+		return false, fmt.Errorf("failed to parse new cluster stack template: %w", err)
+	}
+
+	// oldObjectMap := getResourceMapOfUnstructuredObjects(oldObjects)
+	for _, newObject := range newObjects {
+		// do nothing if found
+		// if _, found := oldObjectMap[types.NamespacedName{Name: newObject.GetName(), Namespace: newObject.GetNamespace()}]; found {
+		// 	continue
+		// }
+
+		logger.Info("object to be applied", "object", newObject.GetName(), "kind", newObject.GetKind())
+
+		if err := setLabel(newObject, ObjectLabelKeyOwned, ObjectLabelValueOwned); err != nil {
+			return false, fmt.Errorf("error setting label: %w", err)
+		}
+
+		// call the function and get dynamic.ResourceInterface
+		// getDynamicResourceInterface
+		dr, err := getDynamicResourceInterface(k.Namespace, k.RestConfig, newObject.GroupVersionKind())
+		if err != nil {
+			reterr := fmt.Errorf("failed to get dynamic resource interface: %w", err)
+			logger.Error(reterr, "failed to get dynamic resource interface", "obj", newObject.GetObjectKind().GroupVersionKind())
+			shouldRequeue = true
+			continue
+		}
+
+		if _, err := dr.Apply(ctx, newObject.GetName(), newObject, metav1.ApplyOptions{FieldManager: "kubectl", Force: true}); err != nil {
+			reterr := fmt.Errorf("failed to apply object: %w", err)
+			logger.Error(reterr, "failed to apply object", "obj", newObject.GetObjectKind().GroupVersionKind(), "name", newObject.GetName(), "namespace", newObject.GetNamespace())
+			shouldRequeue = true
+		}
+	}
+
+	for _, object := range resourcesToBeDeletedFromUnstructuredObjects(oldObjects, newObjects) {
+		logger.Info("resource are being deleted", "kind", object.GetKind(), "name", object.GetName(), "namespace", object.GetNamespace())
+
+		dr, err := getDynamicResourceInterface(k.Namespace, k.RestConfig, object.GroupVersionKind())
+		if err != nil {
+			return false, fmt.Errorf("failed to get dynamic resource interface: %w", err)
+		}
+
+		if err := dr.Delete(ctx, object.GetName(), metav1.DeleteOptions{}); err != nil && !apierrors.IsNotFound(err) {
+			reterr := fmt.Errorf("failed to delete object: %w", err)
+			logger.Error(reterr, "failed to delete object", "obj", object.GroupVersionKind(), "namespacedName", fmt.Sprintf("%s/%s", object.GetNamespace(), object.GetName()))
+			// append resource to status and requeue again to be able to retry deletion
+			shouldRequeue = true
+		}
+	}
+
+	return shouldRequeue, nil
+}
+
+func (k *kube) DeleteNewClusterStack(ctx context.Context, template []byte) (shouldRequeue bool, err error) {
+	logger := log.FromContext(ctx)
+
+	// oldObjects, err := parseK8sYaml(oldTemplate)
+	// if err != nil {
+	// 	return false, fmt.Errorf("failed to parse old cluster stack template: %w", err)
+	// }
+
+	objects, err := parseK8sYaml(template)
+	if err != nil {
+		return false, fmt.Errorf("failed to parse new cluster stack template: %w", err)
+	}
+
+	// oldObjectMap := getResourceMapOfUnstructuredObjects(objects)
+	for _, object := range objects {
+		// do nothing if synced
+		// if _, found := oldObjectMap[types.NamespacedName{Name: newObject.GetName(), Namespace: newObject.GetNamespace()}]; found {
+		// 	continue
+		// }
+
+		logger.Info("object to be deleted", "object", object.GetName(), "kind", object.GetKind())
+
+		if err := setLabel(object, ObjectLabelKeyOwned, ObjectLabelValueOwned); err != nil {
+			return false, fmt.Errorf("error setting label: %w", err)
+		}
+
+		dr, err := getDynamicResourceInterface(k.Namespace, k.RestConfig, object.GroupVersionKind())
+		if err != nil {
+			return false, fmt.Errorf("failed to get dynamic resource interface: %w", err)
+		}
+
+		if err := dr.Delete(ctx, object.GetName(), metav1.DeleteOptions{}); err != nil {
+			return true, fmt.Errorf("failed to delete object %q: %w", object.GetObjectKind().GroupVersionKind(), err)
+		}
+	}
+
+	return shouldRequeue, nil
+}
+
 func (k *kube) Apply(ctx context.Context, template []byte, oldResources []*csov1alpha1.Resource, shouldDelete bool) (newResources []*csov1alpha1.Resource, shouldRequeue bool, err error) {
 	logger := log.FromContext(ctx)
 
diff --git a/pkg/kube/mocks/Client.go b/pkg/kube/mocks/Client.go
index 971667332..07bca7f13 100644
--- a/pkg/kube/mocks/Client.go
+++ b/pkg/kube/mocks/Client.go
@@ -15,18 +15,18 @@ type Client struct {
 	mock.Mock
 }
 
-// Apply provides a mock function with given fields: ctx, template, oldResources, delete
-func (_m *Client) Apply(ctx context.Context, template []byte, oldResources []*v1alpha1.Resource, delete bool) ([]*v1alpha1.Resource, bool, error) {
-	ret := _m.Called(ctx, template, oldResources, delete)
+// Apply provides a mock function with given fields: ctx, template, oldResources, shouldDelete
+func (_m *Client) Apply(ctx context.Context, template []byte, oldResources []*v1alpha1.Resource, shouldDelete bool) ([]*v1alpha1.Resource, bool, error) {
+	ret := _m.Called(ctx, template, oldResources, shouldDelete)
 
 	var r0 []*v1alpha1.Resource
 	var r1 bool
 	var r2 error
 	if rf, ok := ret.Get(0).(func(context.Context, []byte, []*v1alpha1.Resource, bool) ([]*v1alpha1.Resource, bool, error)); ok {
-		return rf(ctx, template, oldResources, delete)
+		return rf(ctx, template, oldResources, shouldDelete)
 	}
 	if rf, ok := ret.Get(0).(func(context.Context, []byte, []*v1alpha1.Resource, bool) []*v1alpha1.Resource); ok {
-		r0 = rf(ctx, template, oldResources, delete)
+		r0 = rf(ctx, template, oldResources, shouldDelete)
 	} else {
 		if ret.Get(0) != nil {
 			r0 = ret.Get(0).([]*v1alpha1.Resource)
@@ -34,13 +34,13 @@ func (_m *Client) Apply(ctx context.Context, template []byte, oldResources []*v1
 	}
 
 	if rf, ok := ret.Get(1).(func(context.Context, []byte, []*v1alpha1.Resource, bool) bool); ok {
-		r1 = rf(ctx, template, oldResources, delete)
+		r1 = rf(ctx, template, oldResources, shouldDelete)
 	} else {
 		r1 = ret.Get(1).(bool)
 	}
 
 	if rf, ok := ret.Get(2).(func(context.Context, []byte, []*v1alpha1.Resource, bool) error); ok {
-		r2 = rf(ctx, template, oldResources, delete)
+		r2 = rf(ctx, template, oldResources, shouldDelete)
 	} else {
 		r2 = ret.Error(2)
 	}
@@ -48,6 +48,30 @@ func (_m *Client) Apply(ctx context.Context, template []byte, oldResources []*v1
 	return r0, r1, r2
 }
 
+// ApplyNewClusterStack provides a mock function with given fields: ctx, oldTemplate, newTemplate
+func (_m *Client) ApplyNewClusterStack(ctx context.Context, oldTemplate []byte, newTemplate []byte) (bool, error) {
+	ret := _m.Called(ctx, oldTemplate, newTemplate)
+
+	var r0 bool
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, []byte, []byte) (bool, error)); ok {
+		return rf(ctx, oldTemplate, newTemplate)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, []byte, []byte) bool); ok {
+		r0 = rf(ctx, oldTemplate, newTemplate)
+	} else {
+		r0 = ret.Get(0).(bool)
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, []byte, []byte) error); ok {
+		r1 = rf(ctx, oldTemplate, newTemplate)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
 // Delete provides a mock function with given fields: ctx, template, oldResources
 func (_m *Client) Delete(ctx context.Context, template []byte, oldResources []*v1alpha1.Resource) ([]*v1alpha1.Resource, bool, error) {
 	ret := _m.Called(ctx, template, oldResources)
@@ -81,6 +105,30 @@ func (_m *Client) Delete(ctx context.Context, template []byte, oldResources []*v
 	return r0, r1, r2
 }
 
+// DeleteNewClusterStack provides a mock function with given fields: ctx, template
+func (_m *Client) DeleteNewClusterStack(ctx context.Context, template []byte) (bool, error) {
+	ret := _m.Called(ctx, template)
+
+	var r0 bool
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, []byte) (bool, error)); ok {
+		return rf(ctx, template)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, []byte) bool); ok {
+		r0 = rf(ctx, template)
+	} else {
+		r0 = ret.Get(0).(bool)
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, []byte) error); ok {
+		r1 = rf(ctx, template)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
 // NewClient creates a new instance of Client. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
 // The first argument is typically a *testing.T value.
 func NewClient(t interface {
diff --git a/test/cluster-stacks/docker/ferrol/1-27/cluster-addon/cni/Chart.yaml b/test/cluster-stacks/1/docker/ferrol/1-27/cluster-addon/cni/Chart.yaml
similarity index 100%
rename from test/cluster-stacks/docker/ferrol/1-27/cluster-addon/cni/Chart.yaml
rename to test/cluster-stacks/1/docker/ferrol/1-27/cluster-addon/cni/Chart.yaml
diff --git a/test/cluster-stacks/docker/ferrol/1-27/cluster-addon/cni/templates/cni.yaml b/test/cluster-stacks/1/docker/ferrol/1-27/cluster-addon/cni/templates/cni.yaml
similarity index 100%
rename from test/cluster-stacks/docker/ferrol/1-27/cluster-addon/cni/templates/cni.yaml
rename to test/cluster-stacks/1/docker/ferrol/1-27/cluster-addon/cni/templates/cni.yaml
diff --git a/test/cluster-stacks/docker/ferrol/1-27/cluster-addon/cni/values.yaml b/test/cluster-stacks/1/docker/ferrol/1-27/cluster-addon/cni/values.yaml
similarity index 100%
rename from test/cluster-stacks/docker/ferrol/1-27/cluster-addon/cni/values.yaml
rename to test/cluster-stacks/1/docker/ferrol/1-27/cluster-addon/cni/values.yaml
diff --git a/test/cluster-stacks/docker/ferrol/1-27/cluster-addon/metrics-server/.helmignore b/test/cluster-stacks/1/docker/ferrol/1-27/cluster-addon/metrics-server/.helmignore
similarity index 100%
rename from test/cluster-stacks/docker/ferrol/1-27/cluster-addon/metrics-server/.helmignore
rename to test/cluster-stacks/1/docker/ferrol/1-27/cluster-addon/metrics-server/.helmignore
diff --git a/test/cluster-stacks/docker/ferrol/1-27/cluster-addon/metrics-server/Chart.lock b/test/cluster-stacks/1/docker/ferrol/1-27/cluster-addon/metrics-server/Chart.lock
similarity index 100%
rename from test/cluster-stacks/docker/ferrol/1-27/cluster-addon/metrics-server/Chart.lock
rename to test/cluster-stacks/1/docker/ferrol/1-27/cluster-addon/metrics-server/Chart.lock
diff --git a/test/cluster-stacks/docker/ferrol/1-27/cluster-addon/metrics-server/Chart.yaml b/test/cluster-stacks/1/docker/ferrol/1-27/cluster-addon/metrics-server/Chart.yaml
similarity index 100%
rename from test/cluster-stacks/docker/ferrol/1-27/cluster-addon/metrics-server/Chart.yaml
rename to test/cluster-stacks/1/docker/ferrol/1-27/cluster-addon/metrics-server/Chart.yaml
diff --git a/test/cluster-stacks/docker/ferrol/1-27/cluster-addon/metrics-server/charts/metrics-server-3.11.0.tgz b/test/cluster-stacks/1/docker/ferrol/1-27/cluster-addon/metrics-server/charts/metrics-server-3.11.0.tgz
similarity index 100%
rename from test/cluster-stacks/docker/ferrol/1-27/cluster-addon/metrics-server/charts/metrics-server-3.11.0.tgz
rename to test/cluster-stacks/1/docker/ferrol/1-27/cluster-addon/metrics-server/charts/metrics-server-3.11.0.tgz
diff --git a/test/cluster-stacks/docker/ferrol/1-27/cluster-addon/metrics-server/overwrite.yaml b/test/cluster-stacks/1/docker/ferrol/1-27/cluster-addon/metrics-server/overwrite.yaml
similarity index 100%
rename from test/cluster-stacks/docker/ferrol/1-27/cluster-addon/metrics-server/overwrite.yaml
rename to test/cluster-stacks/1/docker/ferrol/1-27/cluster-addon/metrics-server/overwrite.yaml
diff --git a/test/cluster-stacks/1/docker/ferrol/1-27/cluster-addon/metrics-server/templates/ngnix.yaml b/test/cluster-stacks/1/docker/ferrol/1-27/cluster-addon/metrics-server/templates/ngnix.yaml
new file mode 100644
index 000000000..594cb5f6c
--- /dev/null
+++ b/test/cluster-stacks/1/docker/ferrol/1-27/cluster-addon/metrics-server/templates/ngnix.yaml
@@ -0,0 +1,101 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: release-name-ngnix-7777
+  namespace: "kube-system"
+  labels:
+    app.kubernetes.io/instance: release-name
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/name: ngnix
+    app.kubernetes.io/version: 1.25.3
+    helm.sh/chart: ngnix-15.10.1
+spec:
+  replicas: 1
+  revisionHistoryLimit: 10
+  strategy:
+    rollingUpdate: {}
+    type: RollingUpdate
+  selector:
+    matchLabels:
+      app.kubernetes.io/instance: release-name
+      app.kubernetes.io/name: ngnix
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/instance: release-name
+        app.kubernetes.io/managed-by: Helm
+        app.kubernetes.io/name: ngnix
+        app.kubernetes.io/version: 1.25.3
+        helm.sh/chart: ngnix-15.10.1
+      annotations:
+    spec:
+
+      shareProcessNamespace: false
+      serviceAccountName: release-name-ngnix
+      automountServiceAccountToken: false
+      affinity:
+        podAffinity:
+
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+            - podAffinityTerm:
+                labelSelector:
+                  matchLabels:
+                    app.kubernetes.io/instance: release-name
+                    app.kubernetes.io/name: ngnix
+                topologyKey: kubernetes.io/hostname
+              weight: 1
+        nodeAffinity:
+
+      hostNetwork: false
+      hostIPC: false
+      securityContext:
+        fsGroup: 1001
+        fsGroupChangePolicy: Always
+        supplementalGroups: []
+        sysctls: []
+      containers:
+        - name: nginx
+          image: docker.io/bitnami/nginx:1.25.3-debian-11-r6
+          imagePullPolicy: "IfNotPresent"
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop:
+              - ALL
+            privileged: false
+            readOnlyRootFilesystem: false
+            runAsNonRoot: true
+            runAsUser: 1001
+            seccompProfile:
+              type: RuntimeDefault
+          env:
+            - name: BITNAMI_DEBUG
+              value: "false"
+            - name: NGINX_HTTP_PORT_NUMBER
+              value: "8080"
+          envFrom:
+          ports:
+            - name: http
+              containerPort: 8080
+          livenessProbe:
+            failureThreshold: 6
+            initialDelaySeconds: 30
+            periodSeconds: 10
+            successThreshold: 1
+            timeoutSeconds: 5
+            tcpSocket:
+              port: http
+          readinessProbe:
+            failureThreshold: 3
+            initialDelaySeconds: 5
+            periodSeconds: 5
+            successThreshold: 1
+            timeoutSeconds: 3
+            tcpSocket:
+              port: http
+          resources:
+            limits: {}
+            requests: {}
+          volumeMounts:
+      volumes:
diff --git a/test/cluster-stacks/docker/ferrol/1-27/cluster-addon/metrics-server/values.yaml b/test/cluster-stacks/1/docker/ferrol/1-27/cluster-addon/metrics-server/values.yaml
similarity index 100%
rename from test/cluster-stacks/docker/ferrol/1-27/cluster-addon/metrics-server/values.yaml
rename to test/cluster-stacks/1/docker/ferrol/1-27/cluster-addon/metrics-server/values.yaml
diff --git a/test/cluster-stacks/docker/ferrol/1-27/cluster-addon/ngnix/.helmignore b/test/cluster-stacks/1/docker/ferrol/1-27/cluster-class/.helmignore
similarity index 100%
rename from test/cluster-stacks/docker/ferrol/1-27/cluster-addon/ngnix/.helmignore
rename to test/cluster-stacks/1/docker/ferrol/1-27/cluster-class/.helmignore
diff --git a/test/cluster-stacks/docker/ferrol/1-27/cluster-class/Chart.yaml b/test/cluster-stacks/1/docker/ferrol/1-27/cluster-class/Chart.yaml
similarity index 100%
rename from test/cluster-stacks/docker/ferrol/1-27/cluster-class/Chart.yaml
rename to test/cluster-stacks/1/docker/ferrol/1-27/cluster-class/Chart.yaml
diff --git a/test/cluster-stacks/docker/ferrol/1-27/cluster-class/templates/_helpers.tpl b/test/cluster-stacks/1/docker/ferrol/1-27/cluster-class/templates/_helpers.tpl
similarity index 100%
rename from test/cluster-stacks/docker/ferrol/1-27/cluster-class/templates/_helpers.tpl
rename to test/cluster-stacks/1/docker/ferrol/1-27/cluster-class/templates/_helpers.tpl
diff --git a/test/cluster-stacks/docker/ferrol/1-27/cluster-class/templates/cluster-class.yaml b/test/cluster-stacks/1/docker/ferrol/1-27/cluster-class/templates/cluster-class.yaml
similarity index 100%
rename from test/cluster-stacks/docker/ferrol/1-27/cluster-class/templates/cluster-class.yaml
rename to test/cluster-stacks/1/docker/ferrol/1-27/cluster-class/templates/cluster-class.yaml
diff --git a/test/cluster-stacks/docker/ferrol/1-27/cluster-class/templates/docker-cluster-template.yaml b/test/cluster-stacks/1/docker/ferrol/1-27/cluster-class/templates/docker-cluster-template.yaml
similarity index 100%
rename from test/cluster-stacks/docker/ferrol/1-27/cluster-class/templates/docker-cluster-template.yaml
rename to test/cluster-stacks/1/docker/ferrol/1-27/cluster-class/templates/docker-cluster-template.yaml
diff --git a/test/cluster-stacks/docker/ferrol/1-27/cluster-class/templates/docker-machine-template.yaml b/test/cluster-stacks/1/docker/ferrol/1-27/cluster-class/templates/docker-machine-template.yaml
similarity index 100%
rename from test/cluster-stacks/docker/ferrol/1-27/cluster-class/templates/docker-machine-template.yaml
rename to test/cluster-stacks/1/docker/ferrol/1-27/cluster-class/templates/docker-machine-template.yaml
diff --git a/test/cluster-stacks/docker/ferrol/1-27/cluster-class/templates/kubeadm-config-template-worker-docker.yaml b/test/cluster-stacks/1/docker/ferrol/1-27/cluster-class/templates/kubeadm-config-template-worker-docker.yaml
similarity index 100%
rename from test/cluster-stacks/docker/ferrol/1-27/cluster-class/templates/kubeadm-config-template-worker-docker.yaml
rename to test/cluster-stacks/1/docker/ferrol/1-27/cluster-class/templates/kubeadm-config-template-worker-docker.yaml
diff --git a/test/cluster-stacks/docker/ferrol/1-27/cluster-class/templates/kubeadm-control-plane-template.yaml b/test/cluster-stacks/1/docker/ferrol/1-27/cluster-class/templates/kubeadm-control-plane-template.yaml
similarity index 100%
rename from test/cluster-stacks/docker/ferrol/1-27/cluster-class/templates/kubeadm-control-plane-template.yaml
rename to test/cluster-stacks/1/docker/ferrol/1-27/cluster-class/templates/kubeadm-control-plane-template.yaml
diff --git a/test/cluster-stacks/docker/ferrol/1-27/cluster-class/values.yaml b/test/cluster-stacks/1/docker/ferrol/1-27/cluster-class/values.yaml
similarity index 100%
rename from test/cluster-stacks/docker/ferrol/1-27/cluster-class/values.yaml
rename to test/cluster-stacks/1/docker/ferrol/1-27/cluster-class/values.yaml
diff --git a/test/cluster-stacks/docker/ferrol/1-27/clusteraddon.yaml b/test/cluster-stacks/1/docker/ferrol/1-27/clusteraddon.yaml
similarity index 100%
rename from test/cluster-stacks/docker/ferrol/1-27/clusteraddon.yaml
rename to test/cluster-stacks/1/docker/ferrol/1-27/clusteraddon.yaml
diff --git a/test/cluster-stacks/1/docker/ferrol/1-27/csmctl.yaml b/test/cluster-stacks/1/docker/ferrol/1-27/csmctl.yaml
new file mode 100644
index 000000000..6b20cf03b
--- /dev/null
+++ b/test/cluster-stacks/1/docker/ferrol/1-27/csmctl.yaml
@@ -0,0 +1,7 @@
+apiVersion: csmctl.clusterstack.x-k8s.io/v1alpha1
+config:
+  kubernetesVersion: v1.27.6
+  clusterStackName: ferrol
+  provider:
+    type: docker
+    apiVersion: docker.csmctl.clusterstack.x-k8s.io/v1alpha1
diff --git a/test/cluster-stacks/docker/ferrol/1-27/node-image/Dockerfile.controlplane b/test/cluster-stacks/1/docker/ferrol/1-27/node-image/Dockerfile.controlplane
similarity index 100%
rename from test/cluster-stacks/docker/ferrol/1-27/node-image/Dockerfile.controlplane
rename to test/cluster-stacks/1/docker/ferrol/1-27/node-image/Dockerfile.controlplane
diff --git a/test/cluster-stacks/docker/ferrol/1-27/node-image/Dockerfile.worker b/test/cluster-stacks/1/docker/ferrol/1-27/node-image/Dockerfile.worker
similarity index 100%
rename from test/cluster-stacks/docker/ferrol/1-27/node-image/Dockerfile.worker
rename to test/cluster-stacks/1/docker/ferrol/1-27/node-image/Dockerfile.worker
diff --git a/test/cluster-stacks/docker/ferrol/1-27/node-image/scripts/base.sh b/test/cluster-stacks/1/docker/ferrol/1-27/node-image/scripts/base.sh
similarity index 100%
rename from test/cluster-stacks/docker/ferrol/1-27/node-image/scripts/base.sh
rename to test/cluster-stacks/1/docker/ferrol/1-27/node-image/scripts/base.sh
diff --git a/test/cluster-stacks/docker/ferrol/1-27/node-images.yaml b/test/cluster-stacks/1/docker/ferrol/1-27/node-images.yaml
similarity index 100%
rename from test/cluster-stacks/docker/ferrol/1-27/node-images.yaml
rename to test/cluster-stacks/1/docker/ferrol/1-27/node-images.yaml
diff --git a/test/cluster-stacks/docker/ferrol/1-27/topology-docker.yaml b/test/cluster-stacks/1/docker/ferrol/1-27/topology-docker.yaml
similarity index 100%
rename from test/cluster-stacks/docker/ferrol/1-27/topology-docker.yaml
rename to test/cluster-stacks/1/docker/ferrol/1-27/topology-docker.yaml
diff --git a/test/cluster-stacks/2/docker/ferrol/1-27/cluster-addon/cni/Chart.yaml b/test/cluster-stacks/2/docker/ferrol/1-27/cluster-addon/cni/Chart.yaml
new file mode 100644
index 000000000..f04b67a8d
--- /dev/null
+++ b/test/cluster-stacks/2/docker/ferrol/1-27/cluster-addon/cni/Chart.yaml
@@ -0,0 +1,9 @@
+apiVersion: v2
+type: application
+description: CNI chart for kind
+name: CNI
+version: '0'
+maintainers:
+  - name: Syself
+    email: info@syself.com
+    url: https://github.com/syself
diff --git a/test/cluster-stacks/2/docker/ferrol/1-27/cluster-addon/cni/templates/cni.yaml b/test/cluster-stacks/2/docker/ferrol/1-27/cluster-addon/cni/templates/cni.yaml
new file mode 100644
index 000000000..fbe82f541
--- /dev/null
+++ b/test/cluster-stacks/2/docker/ferrol/1-27/cluster-addon/cni/templates/cni.yaml
@@ -0,0 +1,120 @@
+# kindnetd networking manifest
+---
+kind: ClusterRole
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: kindnet
+  name: kindnet
+  name: kindnet
+rules:
+  - apiGroups:
+      - ""
+    resources:
+      - nodes
+    verbs:
+      - list
+      - watch
+      - patch
+  - apiGroups:
+      - ""
+    resources:
+      - configmaps
+    verbs:
+      - get
+---
+kind: ClusterRoleBinding
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: kindnet
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: kindnet
+subjects:
+  - kind: ServiceAccount
+    name: kindnet
+    namespace: kube-system
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: kindnet
+  namespace: kube-system
+---
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: kindnet
+  namespace: kube-system
+  labels:
+    tier: node
+    app: kindnet
+    k8s-app: kindnet
+spec:
+  selector:
+    matchLabels:
+      app: kindnet
+  template:
+    metadata:
+      labels:
+        tier: node
+        app: kindnet
+        k8s-app: kindnet
+    spec:
+      hostNetwork: true
+      tolerations:
+        - operator: Exists
+          effect: NoSchedule
+      serviceAccountName: kindnet
+      containers:
+        - name: kindnet-cni
+          image: kindest/kindnetd:v20230511-dc714da8
+          env:
+            - name: HOST_IP
+              valueFrom:
+                fieldRef:
+                  fieldPath: status.hostIP
+            - name: POD_IP
+              valueFrom:
+                fieldRef:
+                  fieldPath: status.podIP
+            # We're using the dualstack CIDRs here. The order doesn't matter for kindnet as the loops are run concurrently.
+            # REF: https://github.com/kubernetes-sigs/kind/blob/3dbeb894e3092a336ab4278d3823e73a1d66aff7/images/kindnetd/cmd/kindnetd/main.go#L149-L175
+            - name: POD_SUBNET
+              value: '${DOCKER_POD_CIDRS},${DOCKER_POD_IPV6_CIDRS}'
+          volumeMounts:
+            - name: cni-cfg
+              mountPath: /etc/cni/net.d
+            - name: xtables-lock
+              mountPath: /run/xtables.lock
+              readOnly: false
+            - name: lib-modules
+              mountPath: /lib/modules
+              readOnly: true
+          resources:
+            requests:
+              cpu: "100m"
+              memory: "50Mi"
+            limits:
+              cpu: "100m"
+              memory: "50Mi"
+          securityContext:
+            privileged: false
+            capabilities:
+              add: ["NET_RAW", "NET_ADMIN"]
+      volumes:
+        - name: cni-bin
+          hostPath:
+            path: /opt/cni/bin
+            type: DirectoryOrCreate
+        - name: cni-cfg
+          hostPath:
+            path: /etc/cni/net.d
+            type: DirectoryOrCreate
+        - name: xtables-lock
+          hostPath:
+            path: /run/xtables.lock
+            type: FileOrCreate
+        - name: lib-modules
+          hostPath:
+            path: /lib/modules
diff --git a/test/cluster-stacks/2/docker/ferrol/1-27/cluster-addon/cni/values.yaml b/test/cluster-stacks/2/docker/ferrol/1-27/cluster-addon/cni/values.yaml
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/cluster-stacks/docker/ferrol/1-27/cluster-class/.helmignore b/test/cluster-stacks/2/docker/ferrol/1-27/cluster-addon/metrics-server/.helmignore
similarity index 100%
rename from test/cluster-stacks/docker/ferrol/1-27/cluster-class/.helmignore
rename to test/cluster-stacks/2/docker/ferrol/1-27/cluster-addon/metrics-server/.helmignore
diff --git a/test/cluster-stacks/2/docker/ferrol/1-27/cluster-addon/metrics-server/Chart.lock b/test/cluster-stacks/2/docker/ferrol/1-27/cluster-addon/metrics-server/Chart.lock
new file mode 100644
index 000000000..dcf1105c2
--- /dev/null
+++ b/test/cluster-stacks/2/docker/ferrol/1-27/cluster-addon/metrics-server/Chart.lock
@@ -0,0 +1,6 @@
+dependencies:
+- name: metrics-server
+  repository: https://kubernetes-sigs.github.io/metrics-server/
+  version: 3.11.0
+digest: sha256:d92caa34d06b047b0390aa33a6f5d15d4fe0566143625204ebbbc69085133c4e
+generated: "2024-01-08T18:57:56.42493498+05:30"
diff --git a/test/cluster-stacks/2/docker/ferrol/1-27/cluster-addon/metrics-server/Chart.yaml b/test/cluster-stacks/2/docker/ferrol/1-27/cluster-addon/metrics-server/Chart.yaml
new file mode 100644
index 000000000..1079e6f15
--- /dev/null
+++ b/test/cluster-stacks/2/docker/ferrol/1-27/cluster-addon/metrics-server/Chart.yaml
@@ -0,0 +1,16 @@
+apiVersion: v2
+type: application
+description: |
+  This chart installs and configures:
+  * Docker Ferrol Cluster Class
+name: docker-ferrol-1-27-cluster-addon
+version: << .ClusterAddonVersion >>
+maintainers:
+  - name: Syself
+    email: info@syself.com
+    url: https://github.com/syself
+dependencies:
+  - name: "metrics-server"
+    version: "3.11.0"
+    repository: "https://kubernetes-sigs.github.io/metrics-server/"
+    alias: "metrics-server"
diff --git a/test/cluster-stacks/2/docker/ferrol/1-27/cluster-addon/metrics-server/charts/metrics-server-3.11.0.tgz b/test/cluster-stacks/2/docker/ferrol/1-27/cluster-addon/metrics-server/charts/metrics-server-3.11.0.tgz
new file mode 100644
index 000000000..8860457ec
Binary files /dev/null and b/test/cluster-stacks/2/docker/ferrol/1-27/cluster-addon/metrics-server/charts/metrics-server-3.11.0.tgz differ
diff --git a/test/cluster-stacks/2/docker/ferrol/1-27/cluster-addon/metrics-server/overwrite.yaml b/test/cluster-stacks/2/docker/ferrol/1-27/cluster-addon/metrics-server/overwrite.yaml
new file mode 100644
index 000000000..30a4ded93
--- /dev/null
+++ b/test/cluster-stacks/2/docker/ferrol/1-27/cluster-addon/metrics-server/overwrite.yaml
@@ -0,0 +1,4 @@
+metrics-server:
+  commonLabels:
+    domain: "{{ .Cluster.spec.controlPlaneEndpoint.host }}"
+    clusterAddonVersion: "v2"
diff --git a/test/cluster-stacks/2/docker/ferrol/1-27/cluster-addon/metrics-server/values.yaml b/test/cluster-stacks/2/docker/ferrol/1-27/cluster-addon/metrics-server/values.yaml
new file mode 100644
index 000000000..17847d617
--- /dev/null
+++ b/test/cluster-stacks/2/docker/ferrol/1-27/cluster-addon/metrics-server/values.yaml
@@ -0,0 +1,44 @@
+metrics-server:
+  fullnameOverride: metrics-server
+  replicas: 1
+  updateStrategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxSurge: 0
+      maxUnavailable: 1
+
+  podDisruptionBudget:
+    apiVersion: policy/v1
+    enabled: true
+    minAvailable: 1
+
+  tolerations:
+    - key: node-role.kubernetes.io/master
+      effect: NoSchedule
+    - key: CriticalAddonsOnly
+      operator: Exists
+
+  service:
+    labels:
+      kubernetes.io/cluster-service: "true"
+      kubernetes.io/name: "metrics-server"
+
+  defaultArgs:
+    - --cert-dir=/tmp
+    - --kubelet-preferred-address-types=ExternalIP,Hostname
+    - --kubelet-use-node-status-port
+    - --metric-resolution=15s
+
+  args:
+    - --kubelet-insecure-tls
+
+  affinity:
+    podAntiAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+        - labelSelector:
+            matchExpressions:
+              - key: app.kubernetes.io/name
+                operator: In
+                values:
+                  - metrics-server
+          topologyKey: "kubernetes.io/hostname"
diff --git a/test/cluster-stacks/2/docker/ferrol/1-27/cluster-addon/ngnix/.helmignore b/test/cluster-stacks/2/docker/ferrol/1-27/cluster-addon/ngnix/.helmignore
new file mode 100644
index 000000000..0e8a0eb36
--- /dev/null
+++ b/test/cluster-stacks/2/docker/ferrol/1-27/cluster-addon/ngnix/.helmignore
@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/test/cluster-stacks/docker/ferrol/1-27/cluster-addon/ngnix/Chart.lock b/test/cluster-stacks/2/docker/ferrol/1-27/cluster-addon/ngnix/Chart.lock
similarity index 100%
rename from test/cluster-stacks/docker/ferrol/1-27/cluster-addon/ngnix/Chart.lock
rename to test/cluster-stacks/2/docker/ferrol/1-27/cluster-addon/ngnix/Chart.lock
diff --git a/test/cluster-stacks/docker/ferrol/1-27/cluster-addon/ngnix/Chart.yaml b/test/cluster-stacks/2/docker/ferrol/1-27/cluster-addon/ngnix/Chart.yaml
similarity index 100%
rename from test/cluster-stacks/docker/ferrol/1-27/cluster-addon/ngnix/Chart.yaml
rename to test/cluster-stacks/2/docker/ferrol/1-27/cluster-addon/ngnix/Chart.yaml
diff --git a/test/cluster-stacks/docker/ferrol/1-27/cluster-addon/ngnix/charts/nginx-15.10.1.tgz b/test/cluster-stacks/2/docker/ferrol/1-27/cluster-addon/ngnix/charts/nginx-15.10.1.tgz
similarity index 100%
rename from test/cluster-stacks/docker/ferrol/1-27/cluster-addon/ngnix/charts/nginx-15.10.1.tgz
rename to test/cluster-stacks/2/docker/ferrol/1-27/cluster-addon/ngnix/charts/nginx-15.10.1.tgz
diff --git a/test/cluster-stacks/docker/ferrol/1-27/cluster-addon/ngnix/values.yaml b/test/cluster-stacks/2/docker/ferrol/1-27/cluster-addon/ngnix/values.yaml
similarity index 100%
rename from test/cluster-stacks/docker/ferrol/1-27/cluster-addon/ngnix/values.yaml
rename to test/cluster-stacks/2/docker/ferrol/1-27/cluster-addon/ngnix/values.yaml
diff --git a/test/cluster-stacks/2/docker/ferrol/1-27/cluster-class/.helmignore b/test/cluster-stacks/2/docker/ferrol/1-27/cluster-class/.helmignore
new file mode 100644
index 000000000..0e8a0eb36
--- /dev/null
+++ b/test/cluster-stacks/2/docker/ferrol/1-27/cluster-class/.helmignore
@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/test/cluster-stacks/2/docker/ferrol/1-27/cluster-class/Chart.yaml b/test/cluster-stacks/2/docker/ferrol/1-27/cluster-class/Chart.yaml
new file mode 100644
index 000000000..233c13441
--- /dev/null
+++ b/test/cluster-stacks/2/docker/ferrol/1-27/cluster-class/Chart.yaml
@@ -0,0 +1,11 @@
+apiVersion: v2
+description: |
+  This chart installs and configures:
+  * Docker Ferrol Cluster Class
+maintainers:
+  - name: Syself
+    email: info@syself.com
+    url: https://github.com/syself
+name: docker-ferrol-1-27-cluster-class
+type: application
+version: << .ClusterAddonVersion >>
diff --git a/test/cluster-stacks/2/docker/ferrol/1-27/cluster-class/templates/_helpers.tpl b/test/cluster-stacks/2/docker/ferrol/1-27/cluster-class/templates/_helpers.tpl
new file mode 100644
index 000000000..2339c1256
--- /dev/null
+++ b/test/cluster-stacks/2/docker/ferrol/1-27/cluster-class/templates/_helpers.tpl
@@ -0,0 +1,62 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "cluster-class.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "cluster-class.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "cluster-class.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "cluster-class.labels" -}}
+helm.sh/chart: {{ include "cluster-class.chart" . }}
+{{ include "cluster-class.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "cluster-class.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "cluster-class.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "cluster-class.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "cluster-class.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}
diff --git a/test/cluster-stacks/2/docker/ferrol/1-27/cluster-class/templates/cluster-class.yaml b/test/cluster-stacks/2/docker/ferrol/1-27/cluster-class/templates/cluster-class.yaml
new file mode 100644
index 000000000..3f6cb505a
--- /dev/null
+++ b/test/cluster-stacks/2/docker/ferrol/1-27/cluster-class/templates/cluster-class.yaml
@@ -0,0 +1,101 @@
+apiVersion: cluster.x-k8s.io/v1beta1
+kind: ClusterClass
+metadata:
+  name: {{ .Release.Name }}-{{ .Chart.Version }}
+  namespace: {{.Release.Namespace}}
+spec:
+  controlPlane:
+    ref:
+      apiVersion: controlplane.cluster.x-k8s.io/v1beta1
+      kind: KubeadmControlPlaneTemplate
+      name: {{ .Release.Name }}-{{ .Chart.Version }}-control-plane
+      namespace: {{ .Release.Namespace }}
+    machineInfrastructure:
+      ref:
+        kind: DockerMachineTemplate
+        apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+        name: {{ .Release.Name }}-{{ .Chart.Version }}-machinetemplate-docker
+        namespace: {{ .Release.Namespace }}
+  infrastructure:
+    ref:
+      apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+      kind: DockerClusterTemplate
+      name: {{ .Release.Name }}-{{ .Chart.Version }}-cluster
+      namespace: {{ .Release.Namespace }}
+  workers:
+    machineDeployments:
+    - class: workeramd64
+      template:
+        bootstrap:
+          ref:
+            apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
+            kind: KubeadmConfigTemplate
+            name: {{ .Release.Name }}-{{ .Chart.Version }}-worker-bootstraptemplate-docker
+            namespace: {{ .Release.Namespace }}
+        infrastructure:
+          ref:
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+            kind: DockerMachineTemplate
+            name: {{ .Release.Name }}-{{ .Chart.Version }}-machinetemplate-docker
+            namespace: {{ .Release.Namespace }}
+  variables:
+  - name: imageRepository
+    required: true
+    schema:
+      openAPIV3Schema:
+        type: string
+        default: ""
+        example: "registry.k8s.io"
+        description: "imageRepository sets the container registry to pull images from. If empty, nothing will be set and the from of kubeadm will be used."
+  patches:
+  - name: imageRepository
+    description: "Sets the imageRepository used for the KubeadmControlPlane."
+    enabledIf: '{{ ne .imageRepository "" }}'
+    definitions:
+    - selector:
+        apiVersion: controlplane.cluster.x-k8s.io/v1beta1
+        kind: KubeadmControlPlaneTemplate
+        matchResources:
+          controlPlane: true
+      jsonPatches:
+      - op: add
+        path: "/spec/template/spec/kubeadmConfigSpec/clusterConfiguration/imageRepository"
+        valueFrom:
+          variable: imageRepository
+  - name: customImage
+    description: "Sets the container image that is used for running dockerMachines for the controlplane and worker machineDeployments."
+    definitions:
+    - selector:
+        apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+        kind: DockerMachineTemplate
+        matchResources:
+          machineDeploymentClass:
+            names:
+            - workeramd64
+      jsonPatches:
+      - op: add
+        path: "/spec/template/spec/customImage"
+        value: {{ (index .Values.images.controlPlane 0).name }}
+    - selector:
+        apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+        kind: DockerMachineTemplate
+        matchResources:
+          controlPlane: true
+      jsonPatches:
+      - op: add
+        path: "/spec/template/spec/customImage"
+        value: {{ (index .Values.images.controlPlane 0).name }}
+  - name: DockerMachineTemplateWorker
+    description: "Sets the container image that is used for running dockerMachines for the worker machineDeployments."
+    definitions:
+      - selector:
+          apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+          kind: DockerMachineTemplate
+          matchResources:
+            machineDeploymentClass:
+              names:
+                - workeramd64
+        jsonPatches:
+          - op: add
+            path: "/spec/template/spec/customImage"
+            value: {{ (index .Values.images.worker 0).name }}
diff --git a/test/cluster-stacks/2/docker/ferrol/1-27/cluster-class/templates/docker-cluster-template.yaml b/test/cluster-stacks/2/docker/ferrol/1-27/cluster-class/templates/docker-cluster-template.yaml
new file mode 100644
index 000000000..0bdf7120d
--- /dev/null
+++ b/test/cluster-stacks/2/docker/ferrol/1-27/cluster-class/templates/docker-cluster-template.yaml
@@ -0,0 +1,8 @@
+apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+kind: DockerClusterTemplate
+metadata:
+  name: {{ .Release.Name }}-{{ .Chart.Version }}-cluster
+  namespace: {{ .Release.Namespace }}
+spec:
+  template:
+    spec: {}
diff --git a/test/cluster-stacks/2/docker/ferrol/1-27/cluster-class/templates/docker-machine-template.yaml b/test/cluster-stacks/2/docker/ferrol/1-27/cluster-class/templates/docker-machine-template.yaml
new file mode 100644
index 000000000..bc4c6cc6c
--- /dev/null
+++ b/test/cluster-stacks/2/docker/ferrol/1-27/cluster-class/templates/docker-machine-template.yaml
@@ -0,0 +1,11 @@
+apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+kind: DockerMachineTemplate
+metadata:
+  name: {{ .Release.Name }}-{{ .Chart.Version }}-machinetemplate-docker
+  namespace: {{ .Release.Namespace }}
+spec:
+  template:
+    spec:
+      extraMounts:
+      - containerPath: "/var/run/docker.sock"
+        hostPath: "/var/run/docker.sock"
diff --git a/test/cluster-stacks/2/docker/ferrol/1-27/cluster-class/templates/kubeadm-config-template-worker-docker.yaml b/test/cluster-stacks/2/docker/ferrol/1-27/cluster-class/templates/kubeadm-config-template-worker-docker.yaml
new file mode 100644
index 000000000..861ccec42
--- /dev/null
+++ b/test/cluster-stacks/2/docker/ferrol/1-27/cluster-class/templates/kubeadm-config-template-worker-docker.yaml
@@ -0,0 +1,15 @@
+apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
+kind: KubeadmConfigTemplate
+metadata:
+  name: {{ .Release.Name }}-{{ .Chart.Version }}-worker-bootstraptemplate-docker
+  namespace: {{ .Release.Namespace }}
+spec:
+  template:
+    spec:
+      joinConfiguration:
+        nodeRegistration:
+          # We have to set the criSocket to containerd as kubeadm defaults to docker runtime if both containerd and docker sockets are found
+          criSocket: unix:///var/run/containerd/containerd.sock
+          kubeletExtraArgs:
+            eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
+            fail-swap-on: "false"
diff --git a/test/cluster-stacks/2/docker/ferrol/1-27/cluster-class/templates/kubeadm-control-plane-template.yaml b/test/cluster-stacks/2/docker/ferrol/1-27/cluster-class/templates/kubeadm-control-plane-template.yaml
new file mode 100644
index 000000000..c76866e72
--- /dev/null
+++ b/test/cluster-stacks/2/docker/ferrol/1-27/cluster-class/templates/kubeadm-control-plane-template.yaml
@@ -0,0 +1,29 @@
+apiVersion: controlplane.cluster.x-k8s.io/v1beta1
+kind: KubeadmControlPlaneTemplate
+metadata:
+  name: {{ .Release.Name }}-{{ .Chart.Version }}-control-plane
+  namespace: {{ .Release.Namespace }}
+spec:
+  template:
+    spec:
+      kubeadmConfigSpec:
+        clusterConfiguration:
+          controllerManager:
+            extraArgs: { enable-hostpath-provisioner: 'true' }
+          apiServer:
+            # host.docker.internal is required by kubetest when running on MacOS because of the way ports are proxied.
+            certSANs: [localhost, 127.0.0.1, 0.0.0.0, host.docker.internal]
+        initConfiguration:
+          nodeRegistration:
+            # We have to set the criSocket to containerd as kubeadm defaults to docker runtime if both containerd and docker sockets are found
+            criSocket: unix:///var/run/containerd/containerd.sock
+            kubeletExtraArgs:
+              eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
+              fail-swap-on: "false"
+        joinConfiguration:
+          nodeRegistration:
+            # We have to set the criSocket to containerd as kubeadm defaults to docker runtime if both containerd and docker sockets are found
+            criSocket: unix:///var/run/containerd/containerd.sock
+            kubeletExtraArgs:
+              eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
+              fail-swap-on: "false"
diff --git a/test/cluster-stacks/2/docker/ferrol/1-27/cluster-class/values.yaml b/test/cluster-stacks/2/docker/ferrol/1-27/cluster-class/values.yaml
new file mode 100644
index 000000000..eb2bb4117
--- /dev/null
+++ b/test/cluster-stacks/2/docker/ferrol/1-27/cluster-class/values.yaml
@@ -0,0 +1,5 @@
+images:
+  controlPlane:
+    - name: ghcr.io/sovereigncloudstack/docker-ferrol-1-27-controlplaneamd64:v1
+  worker:
+    - name: ghcr.io/sovereigncloudstack/docker-ferrol-1-27-workeramd64:v1
diff --git a/test/cluster-stacks/2/docker/ferrol/1-27/clusteraddon.yaml b/test/cluster-stacks/2/docker/ferrol/1-27/clusteraddon.yaml
new file mode 100644
index 000000000..8f5753a04
--- /dev/null
+++ b/test/cluster-stacks/2/docker/ferrol/1-27/clusteraddon.yaml
@@ -0,0 +1,26 @@
+apiVersion: clusteraddonconfig.x-k8s.io/v1alpha1
+clusterAddonVersion: clusteraddons.clusterstack.x-k8s.io/v1alpha1
+addonStages:
+  AfterControlPlaneInitialized:
+    - helmChartName: cni
+      action: apply
+    - helmChartName: metrics-server
+      action: apply
+  BeforeClusterUpgrade:
+    - helmChartName: metrics-server
+      action: apply
+    - helmChartName: ngnix
+      action: apply
+      waitForPostCondition:
+        objects:
+          - key: msdeployment
+            apiVersion: apps/v1
+            kind: Deployment
+            name: metrics-server
+            namespace: kube-system
+          - key: ngnix
+            apiVersion: apps/v1
+            kind: Deployment
+            name: cluster-addon-ngnix
+            namespace: kube-system
+        conditions: msdeployment.spec.replicas == ngnix.spec.replicas
diff --git a/test/cluster-stacks/docker/ferrol/1-27/csmctl.yaml b/test/cluster-stacks/2/docker/ferrol/1-27/csmctl.yaml
similarity index 100%
rename from test/cluster-stacks/docker/ferrol/1-27/csmctl.yaml
rename to test/cluster-stacks/2/docker/ferrol/1-27/csmctl.yaml
diff --git a/test/cluster-stacks/2/docker/ferrol/1-27/node-image/Dockerfile.controlplane b/test/cluster-stacks/2/docker/ferrol/1-27/node-image/Dockerfile.controlplane
new file mode 100644
index 000000000..589301562
--- /dev/null
+++ b/test/cluster-stacks/2/docker/ferrol/1-27/node-image/Dockerfile.controlplane
@@ -0,0 +1,3 @@
+FROM kindest/node:v1.27.3 AS base
+# This is an example. For a real infrastructure provider, you
+# would have some scripts to create a custom machine image.
\ No newline at end of file
diff --git a/test/cluster-stacks/2/docker/ferrol/1-27/node-image/Dockerfile.worker b/test/cluster-stacks/2/docker/ferrol/1-27/node-image/Dockerfile.worker
new file mode 100644
index 000000000..d2ce96d6f
--- /dev/null
+++ b/test/cluster-stacks/2/docker/ferrol/1-27/node-image/Dockerfile.worker
@@ -0,0 +1,3 @@
+FROM kindest/node:v1.27.3 AS base
+# This is an example. For a real infrastructure provider, you
+# would have some scripts to create a custom machine image.
diff --git a/test/cluster-stacks/2/docker/ferrol/1-27/node-image/scripts/base.sh b/test/cluster-stacks/2/docker/ferrol/1-27/node-image/scripts/base.sh
new file mode 100755
index 000000000..f74932578
--- /dev/null
+++ b/test/cluster-stacks/2/docker/ferrol/1-27/node-image/scripts/base.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+
+# Copyright 2024 The Kubernetes Authors.
+#
+# 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.
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+echo '--> Starting Base Installation.'
+# Set locale
+# localectl set-locale LANG=en_US.UTF-8
+# localectl set-locale LANGUAGE=en_US.UTF-8
+
+# Suppress "WARNING: apt does not have a stable CLI interface. Use with caution in scripts."
+echo 'Binary::apt::Apt::Cmd::Disable-Script-Warning "true";' >/etc/apt/apt.conf.d/disable-script-warning
+export DEBIAN_FRONTEND=noninteractive
+
+# update all packages
+apt update -y && apt -y upgrade && apt -y dist-upgrade
+
+# install basic tooling
+apt -y install \
+    at jq unzip wget socat mtr logrotate apt-transport-https network-manager
+
+# Install yq
+YQ_VERSION=v4.30.5 #https://github.com/mikefarah/yq
+YQ_BINARY=yq_linux_amd64
+wget -q https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/${YQ_BINARY} -O /usr/bin/yq &&
+    chmod +x /usr/bin/yq
+
+echo '--> Starting Base Configuration.'
+
+## disable swap
+sed -i '/swap/d' /etc/fstab
diff --git a/test/cluster-stacks/2/docker/ferrol/1-27/node-images.yaml b/test/cluster-stacks/2/docker/ferrol/1-27/node-images.yaml
new file mode 100644
index 000000000..b19d1b715
--- /dev/null
+++ b/test/cluster-stacks/2/docker/ferrol/1-27/node-images.yaml
@@ -0,0 +1,4 @@
+apiVersion: docker.infrastructure.clusterstack.x-k8s.io/v1alpha1
+dockerImages:
+  - controlplaneamd64
+  - workeramd64
diff --git a/test/cluster-stacks/2/docker/ferrol/1-27/topology-docker.yaml b/test/cluster-stacks/2/docker/ferrol/1-27/topology-docker.yaml
new file mode 100644
index 000000000..148838411
--- /dev/null
+++ b/test/cluster-stacks/2/docker/ferrol/1-27/topology-docker.yaml
@@ -0,0 +1,26 @@
+apiVersion: cluster.x-k8s.io/v1beta1
+kind: Cluster
+metadata:
+  name: "${CLUSTER_NAME}"
+  namespace: "${NAMESPACE}"
+spec:
+  clusterNetwork:
+    services:
+      cidrBlocks: ["10.128.0.0/12"]
+    pods:
+      cidrBlocks: ["192.168.0.0/16"]
+    serviceDomain: "cluster.local"
+  topology:
+    class: docker-ferrol-1-27-v2
+    controlPlane:
+      metadata: {}
+      replicas: 1
+    variables:
+      - name: imageRepository
+        value: ""
+    version: v1.27.3
+    workers:
+      machineDeployments:
+        - class: workeramd64
+          name: md-0
+          replicas: 1
diff --git a/test/cluster-stacks/docker/ferrol/1-27/metadata.yaml b/test/cluster-stacks/docker/ferrol/1-27/metadata.yaml
deleted file mode 100644
index e59ea27a2..000000000
--- a/test/cluster-stacks/docker/ferrol/1-27/metadata.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: metadata.clusterstack.x-k8s.io/v1alpha1
-versions:
-  clusterStack: v2
-  kubernetes: v1.27.3
-  components:
-    clusterAddon: v2
-    nodeImage: v2