diff --git a/osmclient/templates/oka/manifest-helmrelease.j2 b/osmclient/templates/oka/manifest-helmrelease.j2
index 075b816..00b56c9 100644
--- a/osmclient/templates/oka/manifest-helmrelease.j2
+++ b/osmclient/templates/oka/manifest-helmrelease.j2
@@ -24,6 +24,7 @@
   chart:
     spec:
       chart: {{ helm_chart }}
+      {% if version %}version: '{{ version }}'{% endif %}
       reconcileStrategy: ChartVersion
       sourceRef:
         kind: HelmRepository
diff --git a/osmclient/templates/oka/template-kustomization.j2 b/osmclient/templates/oka/template-kustomization.j2
index 1cca017..ac967dd 100644
--- a/osmclient/templates/oka/template-kustomization.j2
+++ b/osmclient/templates/oka/template-kustomization.j2
@@ -24,6 +24,7 @@
   interval: 1h0m0s
   path: {{ manifest_folder }}
   prune: true
+  wait: true
   sourceRef:
     kind: GitRepository
     name: sw-catalogs
diff --git a/osmclient/templates/oka/template-namespace.j2 b/osmclient/templates/oka/template-namespace.j2
index 7293d5c..1fb0650 100644
--- a/osmclient/templates/oka/template-namespace.j2
+++ b/osmclient/templates/oka/template-namespace.j2
@@ -18,8 +18,5 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  creationTimestamp: null
   name: {{ namespace }}
-spec: {}
-status: {}