diff --git a/flux/component-constructor.yaml b/flux/component-constructor.yaml
index 3a5c52f..f4d53c8 100644
--- a/flux/component-constructor.yaml
+++ b/flux/component-constructor.yaml
@@ -13,7 +13,7 @@ components:
       # install via helm install
       - name: flux-chart
         type: helmChart
-        version: v2.18.3
+        version: "2.18.3"
         relation: external
         access:
           type: ociArtifact
@@ -21,7 +21,7 @@ components:
 
       - name: flux-chart-values-template
         type: yaml
-        version: v2.18.3
+        version: "2.18.3"
         labels:
           - name: opendefense.cloud/helm/values-for
             value: flux-chart
diff --git a/flux/values.yaml.tpl b/flux/values.yaml.tpl
index eac65da..dc9731b 100644
--- a/flux/values.yaml.tpl
+++ b/flux/values.yaml.tpl
@@ -1,39 +1,39 @@
 {{- $cli := index .OCIResources "cli-image" }}
 cli:
   image: {{ $cli.Host }}/{{ $cli.Repository }}
-  tag: {{ $cli.Tag }}
+  tag: "{{ $cli.Tag }}"
 
 {{- $helmController := index .OCIResources "helm-controller-image" }}
 helmController:
   image: {{ $helmController.Host }}/{{ $helmController.Repository }}
-  tag: {{ $helmController.Tag }}
+  tag: "{{ $helmController.Tag }}"
 
 {{- $imageAutomationController := index .OCIResources "image-automation-controller-image" }}
 imageAutomationController:
   image: {{ $imageAutomationController.Host }}/{{ $imageAutomationController.Repository }}
-  tag: {{ $imageAutomationController.Tag }}
+  tag: "{{ $imageAutomationController.Tag }}"
 
 {{- $imageReflectionController := index .OCIResources "image-reflector-controller-image" }}
 imageReflectionController:
   image: {{ $imageReflectionController.Host }}/{{ $imageReflectionController.Repository }}
-  tag: {{ $imageReflectionController.Tag }}
+  tag: "{{ $imageReflectionController.Tag }}"
 
 {{- $kustomizeController := index .OCIResources "kustomize-controller-image" }}
 kustomizeController:
   image: {{ $kustomizeController.Host }}/{{ $kustomizeController.Repository }}
-  tag: {{ $kustomizeController.Tag }}
+  tag: "{{ $kustomizeController.Tag }}"
 
 {{- $notificationController := index .OCIResources "notification-controller-image" }}
 notificationController:
   image: {{ $notificationController.Host }}/{{ $notificationController.Repository }}
-  tag: {{ $notificationController.Tag }}
+  tag: "{{ $notificationController.Tag }}"
 
 {{- $sourceController := index .OCIResources "source-controller-image" }}
 sourceController:
   image: {{ $sourceController.Host }}/{{ $sourceController.Repository }}
-  tag: {{ $sourceController.Tag }}
+  tag: "{{ $sourceController.Tag }}"
 
 {{- $sourceWatcher := index .OCIResources "source-watcher-image" }}
 sourceWatcher:
   image: {{ $sourceWatcher.Host }}/{{ $sourceWatcher.Repository }}
-  tag: {{ $sourceWatcher.Tag }}
+  tag: "{{ $sourceWatcher.Tag }}"
diff --git a/zot/README.md b/zot/README.md
new file mode 100644
index 0000000..d62d95d
--- /dev/null
+++ b/zot/README.md
@@ -0,0 +1,11 @@
+# zot OCM Component
+
+This directory contains the OCM (Open Component Model) packaging for [zot](https://zotregistry.dev)
+
+## Component structure
+
+```text
+zot/
+├── component-constructor.yaml  # OCM component descriptor
+├── values.yaml.tpl  # values.yaml template for ocm-kit
+```
diff --git a/zot/component-constructor.yaml b/zot/component-constructor.yaml
new file mode 100644
index 0000000..db4f912
--- /dev/null
+++ b/zot/component-constructor.yaml
@@ -0,0 +1,46 @@
+components:
+  - name: opendefense.cloud/zot
+    provider:
+      name: opendefense.cloud
+    labels:
+      - name: app.kubernetes.io/name
+        value: zot
+      - name: app.kubernetes.io/component
+        value: zot
+      - name: app.kubernetes.io/part-of
+        value: zot
+    resources:
+      - name: zot-chart
+        type: helmChart
+        version: "0.1.116"
+        relation: external
+        access:
+          type: ociArtifact
+          imageReference: ghcr.io/project-zot/helm-charts/zot:0.1.116
+
+      - name: flux-chart-values-template
+        type: yaml
+        version: "0.1.116"
+        labels:
+          - name: opendefense.cloud/helm/values-for
+            value: zot-chart
+        relation: local
+        input:
+          type: file
+          path: values.yaml.tpl
+
+      - name: zot-image
+        type: ociImage
+        version: v2.1.17
+        relation: external
+        access:
+          type: ociArtifact
+          imageReference: ghcr.io/project-zot/zot:v2.1.17
+
+      - name: alpine-image
+        type: ociImage
+        version: "3.18"
+        relation: external
+        access:
+          type: ociArtifact
+          imageReference: docker.io/library/alpine:3.18
diff --git a/zot/values.yaml.tpl b/zot/values.yaml.tpl
new file mode 100644
index 0000000..b8f88a6
--- /dev/null
+++ b/zot/values.yaml.tpl
@@ -0,0 +1,10 @@
+{{- $zot := index .OCIResources "zot-image" }}
+image:
+  repository: {{ $zot.Host }}/{{ $zot.Repository }}
+  tag: "{{ $zot.Tag }}"
+
+{{- $alpine := index .OCIResources "alpine-image" }}
+test:
+  image:
+    repository: {{ $alpine.Host }}/{{ $alpine.Repository }}
+    tag: "{{ $alpine.Tag }}"