diff --git a/hydrate-orchestrator/modules/hydrate-kubernetes/helm_repositories.go b/hydrate-orchestrator/modules/hydrate-kubernetes/helm_repositories.go
index 951b9222..9a67f0ee 100644
--- a/hydrate-orchestrator/modules/hydrate-kubernetes/helm_repositories.go
+++ b/hydrate-orchestrator/modules/hydrate-kubernetes/helm_repositories.go
@@ -66,6 +66,14 @@ func (m *HydrateKubernetes) BuildHelmRepositoriesFile(
 
 	var hRepo HelmRepo
 
+	// Set OCI disabled by default
+	ociEnabled := false
+	if envYamlStruct.Oci != nil {
+
+		ociEnabled = *envYamlStruct.Oci
+
+	}
+
 	if envYamlStruct.Registry != "" {
 
 		hRepo = HelmRepo{
@@ -73,6 +81,8 @@ func (m *HydrateKubernetes) BuildHelmRepositoriesFile(
 			Name: repositoryName,
 
 			Url: envYamlStruct.Registry,
+
+			Oci: ociEnabled,
 		}
 
 		helmRepos = append(helmRepos, hRepo)
diff --git a/hydrate-orchestrator/modules/hydrate-kubernetes/render_sys_service.go b/hydrate-orchestrator/modules/hydrate-kubernetes/render_sys_service.go
index df6e7884..307727b3 100644
--- a/hydrate-orchestrator/modules/hydrate-kubernetes/render_sys_service.go
+++ b/hydrate-orchestrator/modules/hydrate-kubernetes/render_sys_service.go
@@ -17,6 +17,7 @@ func (m *HydrateKubernetes) RenderSysService(
 
 	if m.RepositoriesFile == nil {
 
+
 		reposFile, err := m.BuildHelmRepositoriesFile(
 			ctx,
 			m.DotFirestartrDir,
diff --git a/hydrate-orchestrator/modules/hydrate-kubernetes/types.go b/hydrate-orchestrator/modules/hydrate-kubernetes/types.go
index d625fa68..0a6a17bc 100644
--- a/hydrate-orchestrator/modules/hydrate-kubernetes/types.go
+++ b/hydrate-orchestrator/modules/hydrate-kubernetes/types.go
@@ -52,4 +52,5 @@ type EnvYaml struct {
 		Filename string `yaml:"filename"`
 		URL      string `yaml:"url"`
 	} `yaml:"remoteArtifacts,omitempty"`
+	Oci *bool `yaml:"oci,omitempty"`
 }