diff --git a/chart/preflight/.helmignore b/chart/jetstacksecure-mp/charts/preflight/.helmignore
similarity index 100%
rename from chart/preflight/.helmignore
rename to chart/jetstacksecure-mp/charts/preflight/.helmignore
diff --git a/chart/preflight/Chart.yaml b/chart/jetstacksecure-mp/charts/preflight/Chart.yaml
similarity index 100%
rename from chart/preflight/Chart.yaml
rename to chart/jetstacksecure-mp/charts/preflight/Chart.yaml
diff --git a/chart/preflight/README.md b/chart/jetstacksecure-mp/charts/preflight/README.md
similarity index 100%
rename from chart/preflight/README.md
rename to chart/jetstacksecure-mp/charts/preflight/README.md
diff --git a/chart/preflight/templates/NOTES.txt b/chart/jetstacksecure-mp/charts/preflight/templates/NOTES.txt
similarity index 100%
rename from chart/preflight/templates/NOTES.txt
rename to chart/jetstacksecure-mp/charts/preflight/templates/NOTES.txt
diff --git a/chart/preflight/templates/_helpers.tpl b/chart/jetstacksecure-mp/charts/preflight/templates/_helpers.tpl
similarity index 100%
rename from chart/preflight/templates/_helpers.tpl
rename to chart/jetstacksecure-mp/charts/preflight/templates/_helpers.tpl
diff --git a/chart/preflight/templates/deployment.yaml b/chart/jetstacksecure-mp/charts/preflight/templates/deployment.yaml
similarity index 100%
rename from chart/preflight/templates/deployment.yaml
rename to chart/jetstacksecure-mp/charts/preflight/templates/deployment.yaml
diff --git a/chart/preflight/templates/rbac.yaml b/chart/jetstacksecure-mp/charts/preflight/templates/rbac.yaml
similarity index 100%
rename from chart/preflight/templates/rbac.yaml
rename to chart/jetstacksecure-mp/charts/preflight/templates/rbac.yaml
diff --git a/chart/preflight/templates/serviceaccount.yaml b/chart/jetstacksecure-mp/charts/preflight/templates/serviceaccount.yaml
similarity index 100%
rename from chart/preflight/templates/serviceaccount.yaml
rename to chart/jetstacksecure-mp/charts/preflight/templates/serviceaccount.yaml
diff --git a/chart/preflight/values.yaml b/chart/jetstacksecure-mp/charts/preflight/values.yaml
similarity index 100%
rename from chart/preflight/values.yaml
rename to chart/jetstacksecure-mp/charts/preflight/values.yaml
diff --git a/cloudbuild.yaml b/cloudbuild.yaml
index f63b1bc..e48f37c 100644
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@@ -103,6 +103,31 @@ steps:
     waitFor:
       - tag-webhook
 
+
+  - id: clone-ubbagent
+    name: gcr.io/cloud-builders/gcloud
+    entrypoint: bash
+    args:
+      - -exc
+      - git clone https://github.com/GoogleCloudPlatform/ubbagent --branch 0.0.1
+    waitFor: ["-"]
+
+  - id: build-ubbagent
+    name: gcr.io/cloud-builders/docker
+    args:
+      - build
+      - --tag
+      - gcr.io/$PROJECT_ID/${_SOLUTION_NAME}/ubbagent:${_APP_VERSION}
+      - "./ubbagent"
+    waitFor: ["clone-ubbagent"]
+
+  - id: push-ubbagent
+    name: gcr.io/cloud-builders/docker
+    args:
+      - push
+      - gcr.io/$PROJECT_ID/${_SOLUTION_NAME}/ubbagent:${_APP_VERSION}
+    waitFor: ["build-ubbagent"]
+
   - id: build-deployer
     name: gcr.io/cloud-builders/docker
     args:
@@ -192,6 +217,7 @@ steps:
       - push-cainjector
       - push-webhook
       - push-cas-issuer
+      - push-ubbagent
 
   - id: publish
     name: gcr.io/cloud-marketplace-tools/k8s/dev
@@ -213,3 +239,4 @@ images:
   - gcr.io/$PROJECT_ID/${_SOLUTION_NAME}/cert-manager-webhook:${_APP_VERSION}
   - gcr.io/$PROJECT_ID/${_SOLUTION_NAME}/cert-manager-google-cas-issuer:${_APP_VERSION}
   - gcr.io/$PROJECT_ID/${_SOLUTION_NAME}/deployer:${_APP_VERSION}
+  - gcr.io/$PROJECT_ID/${_SOLUTION_NAME}/ubbagent:${_APP_VERSION}