diff --git a/agent/edcv/activity/activity.go b/agent/edcv/activity/activity.go
index c436fa0..6c3d8cc 100644
--- a/agent/edcv/activity/activity.go
+++ b/agent/edcv/activity/activity.go
@@ -47,7 +47,7 @@ type EDCVActivityProcessor struct {
 	tracer               trace.Tracer
 }
 
-type EDCVData struct {
+type edcData struct {
 	ParticipantID       string `json:"cfm.participant.id" validate:"required"`
 	VaultAccessClientID string `json:"clientID.vaultAccess" validate:"required"`
 	ApiAccessClientID   string `json:"clientID.apiAccess" validate:"required"`
@@ -91,7 +91,7 @@ func (p EDCVActivityProcessor) ProcessDeploy(ctx api.ActivityContext) api.Activi
 	_, span := p.tracer.Start(ctx.Context(), "cfm.agent.edcv.deploy")
 	defer span.End()
 
-	var data EDCVData
+	var data edcData
 	err := ctx.ReadValues(&data)
 	if err != nil {
 		span.RecordError(err)
@@ -104,7 +104,7 @@ func (p EDCVActivityProcessor) ProcessDeploy(ctx api.ActivityContext) api.Activi
 }
 
 func (p EDCVActivityProcessor) ProcessDispose(ctx api.ActivityContext) api.ActivityResult {
-	var data EDCVData
+	var data edcData
 	err := ctx.ReadValues(&data)
 	if err != nil {
 		return api.ActivityResult{Result: api.ActivityResultFatalError, Error: fmt.Errorf("error processing EDC-V activity for orchestration %s: %w", ctx.OID(), err)}
@@ -113,7 +113,7 @@ func (p EDCVActivityProcessor) ProcessDispose(ctx api.ActivityContext) api.Activ
 }
 
 // handleDeployAction creates a participant context in IdentityHub and the control plane (incl. participant context config)
-func (p EDCVActivityProcessor) handleDeployAction(ctx api.ActivityContext, data EDCVData, participantContextId string) api.ActivityResult {
+func (p EDCVActivityProcessor) handleDeployAction(ctx api.ActivityContext, data edcData, participantContextId string) api.ActivityResult {
 
 	// override if config is provided
 	if p.CredentialServiceURL != "" {
diff --git a/deployments/k8s/base/nats/deployment.yml b/deployments/k8s/base/nats/deployment.yml
deleted file mode 100644
index 8e12f7f..0000000
--- a/deployments/k8s/base/nats/deployment.yml
+++ /dev/null
@@ -1,59 +0,0 @@
-
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: nats
-  labels:
-    app: nats
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: nats
-  template:
-    metadata:
-      labels:
-        app: nats
-    spec:
-      containers:
-        - name: nats
-          image: nats:2.10-alpine
-          args:
-            - "--jetstream"
-            - "--store_dir=/tmp/jetstream"
-            - "--port=4222"
-            - "--http_port=8222"
-          ports:
-            - name: client
-              containerPort: 4222
-            - name: cluster
-              containerPort: 6222
-            - name: monitor
-              containerPort: 8222
-          volumeMounts:
-            - name: jetstream-storage
-              mountPath: /tmp/jetstream
-          resources:
-            limits:
-              cpu: 500m
-              memory: 512Mi
-            requests:
-              cpu: 250m
-              memory: 256Mi
-          livenessProbe:
-            httpGet:
-              path: /healthz
-              port: monitor
-            initialDelaySeconds: 30
-            periodSeconds: 10
-          readinessProbe:
-            httpGet:
-              path: /healthz
-              port: monitor
-            initialDelaySeconds: 5
-            periodSeconds: 5
-      volumes:
-        - name: jetstream-storage
-          emptyDir:
-            medium: Memory
-            sizeLimit: 1Gi
\ No newline at end of file
diff --git a/deployments/k8s/base/nats/kustomization.yaml b/deployments/k8s/base/nats/kustomization.yaml
deleted file mode 100644
index 1ce75ab..0000000
--- a/deployments/k8s/base/nats/kustomization.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-
-namespace: default
-
-resources:
-  - deployment.yml
-  - service.yml
-
-commonAnnotations:
-  version: "1.0"
\ No newline at end of file
diff --git a/deployments/k8s/base/nats/service.yml b/deployments/k8s/base/nats/service.yml
deleted file mode 100644
index bb0a8cd..0000000
--- a/deployments/k8s/base/nats/service.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: nats-service
-  labels:
-    app: nats
-spec:
-  type: ClusterIP
-  ports:
-  - name: client
-    port: 4222
-    targetPort: client
-  - name: cluster
-    port: 6222
-    targetPort: cluster
-  - name: monitor
-    port: 8222
-    targetPort: monitor
-  selector:
-    app: nats
diff --git a/deployments/k8s/base/pmanager/configmap.yaml b/deployments/k8s/base/pmanager/configmap.yaml
deleted file mode 100644
index c255b26..0000000
--- a/deployments/k8s/base/pmanager/configmap.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: pmanager-config
-  labels:
-    app: pmanager
diff --git a/deployments/k8s/base/pmanager/deployment.yaml b/deployments/k8s/base/pmanager/deployment.yaml
deleted file mode 100644
index 61c5440..0000000
--- a/deployments/k8s/base/pmanager/deployment.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: pmanager
-  labels:
-    app: pmanager
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: pmanager
-  template:
-    metadata:
-      labels:
-        app: pmanager
-    spec:
-      containers:
-        - name: pmanager
-          image: pmanager:latest
-          imagePullPolicy: Never
-          ports:
-            - name: http
-              containerPort: 8181
-          env:
-            - name: NATS_URL
-              value: "nats://nats-service:4222"
-            - name: PM_URI
-              value: "nats://nats-service:4222"
-            - name: PM_BUCKET
-              value: "cfm-bucket"
-            - name: PM_STREAM
-              value: "cfm-stream"
-          resources:
-            limits:
-              cpu: 500m
-              memory: 512Mi
-            requests:
-              cpu: 250m
-              memory: 256Mi
\ No newline at end of file
diff --git a/deployments/k8s/base/pmanager/kustomization.yaml b/deployments/k8s/base/pmanager/kustomization.yaml
deleted file mode 100644
index aa8e0e2..0000000
--- a/deployments/k8s/base/pmanager/kustomization.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-
-namespace: default
-
-resources:
-  - deployment.yaml
-  - service.yaml
-  - configmap.yaml
-
-commonAnnotations:
-  version: "0.1"
\ No newline at end of file
diff --git a/deployments/k8s/base/pmanager/service.yaml b/deployments/k8s/base/pmanager/service.yaml
deleted file mode 100644
index 3f8e713..0000000
--- a/deployments/k8s/base/pmanager/service.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: pmanager-service
-  labels:
-    app: pmanager
-spec:
-  type: NodePort
-  ports:
-    - name: http
-      port: 8181
-      targetPort: http
-      nodePort: 30081
-  selector:
-    app: pmanager
\ No newline at end of file
diff --git a/deployments/k8s/base/testagent/configmap.yaml b/deployments/k8s/base/testagent/configmap.yaml
deleted file mode 100644
index 0b56877..0000000
--- a/deployments/k8s/base/testagent/configmap.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: testagent-config
-  labels:
-    app: testagent
diff --git a/deployments/k8s/base/testagent/deployment.yaml b/deployments/k8s/base/testagent/deployment.yaml
deleted file mode 100644
index 3135265..0000000
--- a/deployments/k8s/base/testagent/deployment.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: testagent
-  labels:
-    app: testagent
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: testagent
-  template:
-    metadata:
-      labels:
-        app: testagent
-    spec:
-      containers:
-        - name: testagent
-          image: testagent:latest
-          imagePullPolicy: Never
-          ports:
-            - name: http
-              containerPort: 8181
-          env:
-            - name: NATS_URL
-              value: "nats://nats-service:4222"
-            - name: TESTAGENT_URI
-              value: "nats://nats-service:4222"
-            - name: TESTAGENT_BUCKET
-              value: "cfm-bucket"
-            - name: TESTAGENT_STREAM
-              value: "cfm-stream"
-          resources:
-            limits:
-              cpu: 500m
-              memory: 512Mi
-            requests:
-              cpu: 250m
-              memory: 256Mi
\ No newline at end of file
diff --git a/deployments/k8s/base/testagent/kustomization.yaml b/deployments/k8s/base/testagent/kustomization.yaml
deleted file mode 100644
index 99846f3..0000000
--- a/deployments/k8s/base/testagent/kustomization.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-
-namespace: default
-
-resources:
-  - deployment.yaml
-  - configmap.yaml
-
-commonAnnotations:
-  version: "0.1"
\ No newline at end of file
diff --git a/deployments/k8s/base/tmanager/configmap.yaml b/deployments/k8s/base/tmanager/configmap.yaml
deleted file mode 100644
index bc83fe6..0000000
--- a/deployments/k8s/base/tmanager/configmap.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: tmanager-config
-  labels:
-    app: tmanager
\ No newline at end of file
diff --git a/deployments/k8s/base/tmanager/deployment.yaml b/deployments/k8s/base/tmanager/deployment.yaml
deleted file mode 100644
index a1e5500..0000000
--- a/deployments/k8s/base/tmanager/deployment.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: tmanager
-  labels:
-    app: tmanager
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: tmanager
-  template:
-    metadata:
-      labels:
-        app: tmanager
-    spec:
-      containers:
-        - name: tmanager
-          image: tmanager:latest
-          imagePullPolicy: Never
-          ports:
-            - name: http
-              containerPort: 8080
-          env:
-            - name: NATS_URL
-              value: "nats://nats-service:4222"
-            - name: TM_URI
-              value: "nats://nats-service:4222"
-            - name: TM_BUCKET
-              value: "cfm-bucket"
-            - name: TM_STREAM
-              value: "cfm-stream"
-          resources:
-            limits:
-              cpu: 500m
-              memory: 512Mi
-            requests:
-              cpu: 250m
-              memory: 256Mi
-#          livenessProbe:
-#            httpGet:
-#              path: /health
-#              port: http
-#            initialDelaySeconds: 15
-#            periodSeconds: 10
-#          readinessProbe:
-#            httpGet:
-#              path: /ready
-#              port: http
-#            initialDelaySeconds: 5
-#            periodSeconds: 5
\ No newline at end of file
diff --git a/deployments/k8s/base/tmanager/kustomization.yaml b/deployments/k8s/base/tmanager/kustomization.yaml
deleted file mode 100644
index aa8e0e2..0000000
--- a/deployments/k8s/base/tmanager/kustomization.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-
-namespace: default
-
-resources:
-  - deployment.yaml
-  - service.yaml
-  - configmap.yaml
-
-commonAnnotations:
-  version: "0.1"
\ No newline at end of file
diff --git a/deployments/k8s/base/tmanager/service.yaml b/deployments/k8s/base/tmanager/service.yaml
deleted file mode 100644
index 82af107..0000000
--- a/deployments/k8s/base/tmanager/service.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: tmanager-service
-  labels:
-    app: tmanager
-spec:
-  type: NodePort
-  ports:
-    - name: http
-      port: 8080
-      targetPort: http
-      nodePort: 30080
-  selector:
-    app: tmanager
\ No newline at end of file
diff --git a/deployments/k8s/overlays/dev/kind-config.yaml b/deployments/k8s/overlays/dev/kind-config.yaml
deleted file mode 100644
index f2873b3..0000000
--- a/deployments/k8s/overlays/dev/kind-config.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-# kind-config.yaml
-kind: Cluster
-apiVersion: kind.x-k8s.io/v1alpha4
-nodes:
-  - role: control-plane
-    extraPortMappings:
-      - containerPort: 30081    # PManager
-        hostPort: 8181
-        protocol: TCP
-      - containerPort: 30080    # TManager
-        hostPort: 8282
-        protocol: TCP
-
diff --git a/deployments/k8s/overlays/dev/kustomization.yaml b/deployments/k8s/overlays/dev/kustomization.yaml
deleted file mode 100644
index bc7a472..0000000
--- a/deployments/k8s/overlays/dev/kustomization.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-
-namespace: dev
-
-resources:
-  - namespace.yaml
-  - ../../base/nats
-  - ../../base/tmanager
-  - ../../base/pmanager
-  - ../../base/testagent
-
-labels:
-  - includeSelectors: false
-    includeTemplates: true
-    pairs:
-      environment: dev
-
-#configMapGenerator:
-#  - name: tmanager-config
-#    behavior: merge
-
-#  - name: pmanager-config
-#    behavior: merge
diff --git a/deployments/k8s/overlays/dev/namespace.yaml b/deployments/k8s/overlays/dev/namespace.yaml
deleted file mode 100644
index 4471f02..0000000
--- a/deployments/k8s/overlays/dev/namespace.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: dev
-  labels:
-    environment: dev
\ No newline at end of file