diff --git a/README.md b/README.md
index 739c705..89c17e2 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,6 @@
 # Lifecycle-manager
 
-[![Pull Request Code test](https://github.com/ironcore-dev/lifecycle-manager/actions/workflows/test.yml/badge.svg)](https://github.com/ironcore-dev/lifecycle-manager/actions/workflows/test.yml)
-[![Lint Golang Codebase](https://github.com/ironcore-dev/lifecycle-manager/actions/workflows/golangci-lint.yml/badge.svg)](https://github.com/ironcore-dev/lifecycle-manager/actions/workflows/golangci-lint.yml)
+[![Main commit workflow](https://github.com/ironcore-dev/lifecycle-manager/actions/workflows/pipeline.yaml/badge.svg?branch=main)](https://github.com/ironcore-dev/lifecycle-manager/actions/workflows/pipeline.yaml)
 [![GitHub License](https://img.shields.io/static/v1?label=License&message=Apache-2.0&color=blue)](LICENSE)
 
 Lifecycle-manager is the Kubernetes operator to manage computes' firmware state and upgrade process.
diff --git a/hack/genproto.sh b/hack/genproto.sh
index 324b67a..53a850c 100755
--- a/hack/genproto.sh
+++ b/hack/genproto.sh
@@ -17,7 +17,7 @@ pushd "$SCRIPT_DIR/.." > /dev/null
 ROOT=$(pwd)
 popd > /dev/null
 
-pushd "$SCRIPT_DIR/../proto" > /dev/null
+pushd "$SCRIPT_DIR/../lcmi" > /dev/null
 export PATH=$PATH:$ROOT/bin
 
 echo "Generating ${blue}proto${normal}"
diff --git a/proto/commonapi/buf.lock b/lcmi/api/buf.lock
similarity index 100%
rename from proto/commonapi/buf.lock
rename to lcmi/api/buf.lock
diff --git a/proto/machineapi/buf.yaml b/lcmi/api/buf.yaml
similarity index 100%
rename from proto/machineapi/buf.yaml
rename to lcmi/api/buf.yaml
diff --git a/proto/commonapi/common/v1alpha1/api.proto b/lcmi/api/common/v1alpha1/api.proto
similarity index 100%
rename from proto/commonapi/common/v1alpha1/api.proto
rename to lcmi/api/common/v1alpha1/api.proto
diff --git a/proto/machineapi/machine/v1alpha1/api.proto b/lcmi/api/machine/v1alpha1/api.proto
similarity index 100%
rename from proto/machineapi/machine/v1alpha1/api.proto
rename to lcmi/api/machine/v1alpha1/api.proto
diff --git a/proto/machinetypeapi/machinetype/v1alpha1/api.proto b/lcmi/api/machinetype/v1alpha1/api.proto
similarity index 100%
rename from proto/machinetypeapi/machinetype/v1alpha1/api.proto
rename to lcmi/api/machinetype/v1alpha1/api.proto
diff --git a/proto/storageapi/storage/v1alpha1/api.proto b/lcmi/api/storage/v1alpha1/api.proto
similarity index 100%
rename from proto/storageapi/storage/v1alpha1/api.proto
rename to lcmi/api/storage/v1alpha1/api.proto
diff --git a/proto/buf.gen.yaml b/lcmi/buf.gen.yaml
similarity index 90%
rename from proto/buf.gen.yaml
rename to lcmi/buf.gen.yaml
index 6ffdb08..aec8475 100644
--- a/proto/buf.gen.yaml
+++ b/lcmi/buf.gen.yaml
@@ -8,10 +8,10 @@ managed:
       - buf.build/k8s/api
 plugins:
   - plugin: buf.build/protocolbuffers/go:v1.32.0
-    out: ../lcmi/api
+    out: api
     opt:
       - paths=source_relative
   - plugin: buf.build/connectrpc/go:v1.15.0
-    out: ../lcmi/api
+    out: api
     opt:
       - paths=source_relative
\ No newline at end of file
diff --git a/lcmi/buf.work.yaml b/lcmi/buf.work.yaml
new file mode 100644
index 0000000..ef388b8
--- /dev/null
+++ b/lcmi/buf.work.yaml
@@ -0,0 +1,4 @@
+version: v1
+directories:
+  - api
+
diff --git a/proto/buf.work.yaml b/proto/buf.work.yaml
deleted file mode 100644
index f9fe178..0000000
--- a/proto/buf.work.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-version: v1
-directories:
-  - commonapi
-  - machineapi
-  - machinetypeapi
-  - storageapi
-
diff --git a/proto/commonapi/buf.yaml b/proto/commonapi/buf.yaml
deleted file mode 100644
index b601607..0000000
--- a/proto/commonapi/buf.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-version: v1
-breaking:
-  use:
-    - FILE
-lint:
-  use:
-    - DEFAULT
-deps:
-  - buf.build/k8s/api
-  - buf.build/bufbuild/protovalidate
diff --git a/proto/machineapi/buf.lock b/proto/machineapi/buf.lock
deleted file mode 100644
index 777eb40..0000000
--- a/proto/machineapi/buf.lock
+++ /dev/null
@@ -1,13 +0,0 @@
-# Generated by buf. DO NOT EDIT.
-version: v1
-deps:
-  - remote: buf.build
-    owner: bufbuild
-    repository: protovalidate
-    commit: e097f827e65240ac9fd4b1158849a8fc
-    digest: shake256:f19252436fd9ded945631e2ffaaed28247a92c9015ccf55ae99db9fb3d9600c4fdb00fd2d3bd7701026ec2fd4715c5129e6ae517c25a59ba690020cfe80bf8ad
-  - remote: buf.build
-    owner: k8s
-    repository: api
-    commit: 8f68e41b943c4de8a5e9c9a921c889a7
-    digest: shake256:38ab77d24cf737d1204719a0ffc654056c29499f26b1546cc5af9ddb34e33799930d79d1f5a4a04b0f5c149097eabbeed37a5d2abf9552169a7d52011f6a8d6f
diff --git a/proto/machinetypeapi/buf.lock b/proto/machinetypeapi/buf.lock
deleted file mode 100644
index 777eb40..0000000
--- a/proto/machinetypeapi/buf.lock
+++ /dev/null
@@ -1,13 +0,0 @@
-# Generated by buf. DO NOT EDIT.
-version: v1
-deps:
-  - remote: buf.build
-    owner: bufbuild
-    repository: protovalidate
-    commit: e097f827e65240ac9fd4b1158849a8fc
-    digest: shake256:f19252436fd9ded945631e2ffaaed28247a92c9015ccf55ae99db9fb3d9600c4fdb00fd2d3bd7701026ec2fd4715c5129e6ae517c25a59ba690020cfe80bf8ad
-  - remote: buf.build
-    owner: k8s
-    repository: api
-    commit: 8f68e41b943c4de8a5e9c9a921c889a7
-    digest: shake256:38ab77d24cf737d1204719a0ffc654056c29499f26b1546cc5af9ddb34e33799930d79d1f5a4a04b0f5c149097eabbeed37a5d2abf9552169a7d52011f6a8d6f
diff --git a/proto/machinetypeapi/buf.yaml b/proto/machinetypeapi/buf.yaml
deleted file mode 100644
index b601607..0000000
--- a/proto/machinetypeapi/buf.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-version: v1
-breaking:
-  use:
-    - FILE
-lint:
-  use:
-    - DEFAULT
-deps:
-  - buf.build/k8s/api
-  - buf.build/bufbuild/protovalidate
diff --git a/proto/storageapi/buf.lock b/proto/storageapi/buf.lock
deleted file mode 100644
index 3ce75d9..0000000
--- a/proto/storageapi/buf.lock
+++ /dev/null
@@ -1,8 +0,0 @@
-# Generated by buf. DO NOT EDIT.
-version: v1
-deps:
-  - remote: buf.build
-    owner: bufbuild
-    repository: protovalidate
-    commit: e097f827e65240ac9fd4b1158849a8fc
-    digest: shake256:f19252436fd9ded945631e2ffaaed28247a92c9015ccf55ae99db9fb3d9600c4fdb00fd2d3bd7701026ec2fd4715c5129e6ae517c25a59ba690020cfe80bf8ad
diff --git a/proto/storageapi/buf.yaml b/proto/storageapi/buf.yaml
deleted file mode 100644
index d661493..0000000
--- a/proto/storageapi/buf.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-version: v1
-breaking:
-  use:
-    - FILE
-lint:
-  use:
-    - DEFAULT
-deps:
-  - buf.build/bufbuild/protovalidate