diff --git a/osmclient/templates/oka/manifest-helmrelease.j2 b/osmclient/templates/oka/manifest-helmrelease.j2
index 075b81698b818fd7b76689ecf66d47a65034c97e..00b56c98bd4ce86b82fb48c723ba96a45a0913aa 100644
--- a/osmclient/templates/oka/manifest-helmrelease.j2
+++ b/osmclient/templates/oka/manifest-helmrelease.j2
@@ -24,6 +24,7 @@ spec:
   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 1cca017ee44403750611c88370a28f79e8533bcd..ac967dde6d84e52f8b1e3876ccf6ec5764deba2c 100644
--- a/osmclient/templates/oka/template-kustomization.j2
+++ b/osmclient/templates/oka/template-kustomization.j2
@@ -24,6 +24,7 @@ spec:
   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 7293d5c6eccc990cd0919dc7eac259df79d91173..1fb06507d29af42505efa7fa9c246a15b0b6224d 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: {}