diff --git a/.circleci/config.yaml b/.circleci/config.yaml
deleted file mode 100644
index 7f2b56e..0000000
--- a/.circleci/config.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-version: 2
-jobs:
-  build:
-    docker: # run the steps with Docker
-
-      - image: circleci/golang:1.15
-        auth:
-          username: javamachr
-          password: $DOCKERHUB_PASSWORD
-    steps:
-      - checkout # check out source code to working directory
-
-      - restore_cache:
-          keys:
-            - go-mod-v4-{{ checksum "go.sum" }}
-
-      - run:
-          name: Install requirements
-          command: make install-requirements
-
-      - run:
-          name: Generate sources
-          command: make generate
-
-      - run:
-          name: Docker login
-          command: make docker-login
-
-      - run:
-          name: Build docker images
-          command: make docker-images
-
-      - run:
-          name: Build docker images
-          command: make docker-images
-
-      - run:
-          name: Push docker images
-          command: make docker-push
\ No newline at end of file
diff --git a/charts/gardener-extension-shoot-cert-service/.helmignore b/charts/gardener-extension-shoot-fleet-agent/.helmignore
similarity index 100%
rename from charts/gardener-extension-shoot-cert-service/.helmignore
rename to charts/gardener-extension-shoot-fleet-agent/.helmignore
diff --git a/charts/gardener-extension-shoot-cert-service/Chart.yaml b/charts/gardener-extension-shoot-fleet-agent/Chart.yaml
similarity index 100%
rename from charts/gardener-extension-shoot-cert-service/Chart.yaml
rename to charts/gardener-extension-shoot-fleet-agent/Chart.yaml
diff --git a/charts/gardener-extension-shoot-cert-service/doc.go b/charts/gardener-extension-shoot-fleet-agent/doc.go
similarity index 100%
rename from charts/gardener-extension-shoot-cert-service/doc.go
rename to charts/gardener-extension-shoot-fleet-agent/doc.go
diff --git a/charts/gardener-extension-shoot-cert-service/templates/_helpers.tpl b/charts/gardener-extension-shoot-fleet-agent/templates/_helpers.tpl
similarity index 100%
rename from charts/gardener-extension-shoot-cert-service/templates/_helpers.tpl
rename to charts/gardener-extension-shoot-fleet-agent/templates/_helpers.tpl
diff --git a/charts/gardener-extension-shoot-cert-service/templates/configmap-imagevector-overwrite.yaml b/charts/gardener-extension-shoot-fleet-agent/templates/configmap-imagevector-overwrite.yaml
similarity index 100%
rename from charts/gardener-extension-shoot-cert-service/templates/configmap-imagevector-overwrite.yaml
rename to charts/gardener-extension-shoot-fleet-agent/templates/configmap-imagevector-overwrite.yaml
diff --git a/charts/gardener-extension-shoot-cert-service/templates/deployment.yaml b/charts/gardener-extension-shoot-fleet-agent/templates/deployment.yaml
similarity index 100%
rename from charts/gardener-extension-shoot-cert-service/templates/deployment.yaml
rename to charts/gardener-extension-shoot-fleet-agent/templates/deployment.yaml
diff --git a/charts/gardener-extension-shoot-cert-service/templates/fleet-config.yaml b/charts/gardener-extension-shoot-fleet-agent/templates/fleet-config.yaml
similarity index 100%
rename from charts/gardener-extension-shoot-cert-service/templates/fleet-config.yaml
rename to charts/gardener-extension-shoot-fleet-agent/templates/fleet-config.yaml
diff --git a/charts/gardener-extension-shoot-cert-service/templates/priorityclass.yaml b/charts/gardener-extension-shoot-fleet-agent/templates/priorityclass.yaml
similarity index 100%
rename from charts/gardener-extension-shoot-cert-service/templates/priorityclass.yaml
rename to charts/gardener-extension-shoot-fleet-agent/templates/priorityclass.yaml
diff --git a/charts/gardener-extension-shoot-cert-service/templates/rbac-shoot-cert-service.yaml b/charts/gardener-extension-shoot-fleet-agent/templates/rbac-shoot-cert-service.yaml
similarity index 100%
rename from charts/gardener-extension-shoot-cert-service/templates/rbac-shoot-cert-service.yaml
rename to charts/gardener-extension-shoot-fleet-agent/templates/rbac-shoot-cert-service.yaml
diff --git a/charts/gardener-extension-shoot-cert-service/templates/rbac.yaml b/charts/gardener-extension-shoot-fleet-agent/templates/rbac.yaml
similarity index 100%
rename from charts/gardener-extension-shoot-cert-service/templates/rbac.yaml
rename to charts/gardener-extension-shoot-fleet-agent/templates/rbac.yaml
diff --git a/charts/gardener-extension-shoot-cert-service/templates/serviceaccount.yaml b/charts/gardener-extension-shoot-fleet-agent/templates/serviceaccount.yaml
similarity index 100%
rename from charts/gardener-extension-shoot-cert-service/templates/serviceaccount.yaml
rename to charts/gardener-extension-shoot-fleet-agent/templates/serviceaccount.yaml
diff --git a/charts/gardener-extension-shoot-cert-service/templates/vpa.yaml b/charts/gardener-extension-shoot-fleet-agent/templates/vpa.yaml
similarity index 100%
rename from charts/gardener-extension-shoot-cert-service/templates/vpa.yaml
rename to charts/gardener-extension-shoot-fleet-agent/templates/vpa.yaml
diff --git a/charts/gardener-extension-shoot-cert-service/values.yaml b/charts/gardener-extension-shoot-fleet-agent/values.yaml
similarity index 100%
rename from charts/gardener-extension-shoot-cert-service/values.yaml
rename to charts/gardener-extension-shoot-fleet-agent/values.yaml
diff --git a/example/controller-registration.yaml b/example/controller-registration.yaml
index 9e61f8c..6e89af8 100644
--- a/example/controller-registration.yaml
+++ b/example/controller-registration.yaml
@@ -14,5 +14,3 @@ spec:
       values:
         image:
           tag: v1.0.0-dev
-        fleetManager:
-          kubeconfig: #base64 encoded kubeconfig pointing to Fleet manager cluster with correct access rights(rw secret/cluster.fleet.cattle.io