diff --git a/controller/unbootstrap.go b/controller/unbootstrap.go
index 9116daf5..7149301d 100644
--- a/controller/unbootstrap.go
+++ b/controller/unbootstrap.go
@@ -5,8 +5,11 @@ import (
 	"fmt"
 	"github.com/openziti/edge-api/rest_management_api_client"
 	apiConfig "github.com/openziti/edge-api/rest_management_api_client/config"
+	"github.com/openziti/edge-api/rest_management_api_client/edge_router_policy"
+	"github.com/openziti/edge-api/rest_management_api_client/identity"
 	"github.com/openziti/zrok/controller/config"
 	"github.com/openziti/zrok/controller/zrokEdgeSdk"
+	"github.com/openziti/zrok/sdk/golang/sdk"
 	"github.com/sirupsen/logrus"
 )
 
@@ -15,14 +18,63 @@ func Unbootstrap(cfg *config.Config) error {
 	if err != nil {
 		return err
 	}
+	if err := unbootstrapEdgeRouterPolicies(edge); err != nil {
+		logrus.Errorf("error unbootstrapping edge router policies: %v", err)
+	}
+	if err := unbootstrapIdentities(edge); err != nil {
+		logrus.Errorf("error unbootstrapping identities: %v", err)
+	}
 	if err := unbootstrapConfigs(edge); err != nil {
 		logrus.Errorf("error unbootrapping configs: %v", err)
 	}
+	if err := unbootstrapConfigType(edge); err != nil {
+		logrus.Errorf("error unbootstrapping config type: %v", err)
+	}
+	return nil
+}
+
+func unbootstrapEdgeRouterPolicies(edge *rest_management_api_client.ZitiEdgeManagement) error {
+	filter := "tags.zrok != null"
+	limit := int64(100)
+	offset := int64(0)
+	listReq := &edge_router_policy.ListEdgeRouterPoliciesParams{
+		Filter:  &filter,
+		Limit:   &limit,
+		Offset:  &offset,
+		Context: context.Background(),
+	}
+	listResp, err := edge.EdgeRouterPolicy.ListEdgeRouterPolicies(listReq, nil)
+	if err != nil {
+		return err
+	}
+	for _, erp := range listResp.Payload.Data {
+		logrus.Infof("found edge router policy: %v", *erp.ID)
+	}
+	return nil
+}
+
+func unbootstrapIdentities(edge *rest_management_api_client.ZitiEdgeManagement) error {
+	filter := "tags.zrok != null"
+	limit := int64(100)
+	offset := int64(0)
+	listReq := &identity.ListIdentitiesParams{
+		Filter:  &filter,
+		Limit:   &limit,
+		Offset:  &offset,
+		Context: context.Background(),
+	}
+	listResp, err := edge.Identity.ListIdentities(listReq, nil)
+	if err != nil {
+		return err
+	}
+	for _, identity := range listResp.Payload.Data {
+		logrus.Infof("found identity: %v", *identity.ID)
+	}
 	return nil
 }
 
 func unbootstrapConfigs(edge *rest_management_api_client.ZitiEdgeManagement) error {
-	filter := fmt.Sprintf("tags.zrok != null")
+	filter := "tags.zrok != null"
 	limit := int64(100)
 	offset := int64(0)
 	listReq := &apiConfig.ListConfigsParams{
@@ -40,3 +92,23 @@ func unbootstrapConfigs(edge *rest_management_api_client.ZitiEdgeManagement) err
 	}
 	return nil
 }
+
+func unbootstrapConfigType(edge *rest_management_api_client.ZitiEdgeManagement) error {
+	filter := fmt.Sprintf("name = \"%v\"", sdk.ZrokProxyConfig)
+	limit := int64(100)
+	offset := int64(0)
+	listReq := &apiConfig.ListConfigTypesParams{
+		Filter:  &filter,
+		Limit:   &limit,
+		Offset:  &offset,
+		Context: context.Background(),
+	}
+	listResp, err := edge.Config.ListConfigTypes(listReq, nil)
+	if err != nil {
+		return err
+	}
+	for _, listCfgType := range listResp.Payload.Data {
+		logrus.Infof("found config type: %v (%v)", *listCfgType.ID, *listCfgType.Name)
+	}
+	return nil
+}