diff --git a/Makefile b/Makefile
index 62c70484..b6a35a60 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ DATASET_OPERATOR_NAMESPACE=dlf
 
 COMMON_IMAGE_TAG ?= latest
 
-HELM_IMAGE_TAGS = --set global.namespaceYaml="true" --set csi-nfs-chart.csinfs.tag=$(COMMON_IMAGE_TAG) --set csi-s3-chart.csis3.tag=$(COMMON_IMAGE_TAG) --set dataset-operator-chart.generatekeys.tag=$(COMMON_IMAGE_TAG) --set dataset-operator-chart.datasetoperator.tag=$(COMMON_IMAGE_TAG)
+HELM_IMAGE_TAGS = --set global.namespaceYaml="true" --set csi-nfs-chart.csinfs.tag=$(COMMON_IMAGE_TAG) --set csi-s3-chart.csis3.tag=$(COMMON_IMAGE_TAG)
 
 manifests:
 	helm template $(HELM_IMAGE_TAGS) --namespace=$(DATASET_OPERATOR_NAMESPACE) --name-template=default --set csi-h3-chart.enabled="false" chart/ > release-tools/manifests/dlf.yaml
diff --git a/chart/values.yaml b/chart/values.yaml
index fcdf645f..3175a453 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -48,7 +48,7 @@ dataset-operator-chart:
 # dockerRegistrySecret: "anothersecret"
   generatekeys:
     image: "generate-keys"
-    tag: "latest"
+    tag: "0.3.0"
   datasetoperator:
     image: "dataset-operator"
-    tag: "latest"
+    tag: "0.3.0"
diff --git a/release-tools/manifests/dlf-ibm-k8s.yaml b/release-tools/manifests/dlf-ibm-k8s.yaml
index e1c2de03..908fcf0f 100644
--- a/release-tools/manifests/dlf-ibm-k8s.yaml
+++ b/release-tools/manifests/dlf-ibm-k8s.yaml
@@ -1209,7 +1209,7 @@ spec:
       serviceAccountName: dataset-operator
       initContainers:
         - name: generate-keys
-          image: "quay.io/datashim-io/generate-keys:latest"
+          image: "quay.io/datashim-io/generate-keys:0.3.0"
           imagePullPolicy: Always
           env:
             - name: DATASET_OPERATOR_NAMESPACE
@@ -1217,7 +1217,7 @@ spec:
       containers:
         - name: dataset-operator
           # Replace this with the built image name
-          image: "quay.io/datashim-io/dataset-operator:latest"
+          image: "quay.io/datashim-io/dataset-operator:0.3.0"
           command:
             - /manager
           imagePullPolicy: Always
diff --git a/release-tools/manifests/dlf-ibm-oc.yaml b/release-tools/manifests/dlf-ibm-oc.yaml
index f7e59e24..61906c95 100644
--- a/release-tools/manifests/dlf-ibm-oc.yaml
+++ b/release-tools/manifests/dlf-ibm-oc.yaml
@@ -1012,7 +1012,7 @@ spec:
       serviceAccountName: dataset-operator
       initContainers:
         - name: generate-keys
-          image: "quay.io/datashim-io/generate-keys:latest"
+          image: "quay.io/datashim-io/generate-keys:0.3.0"
           imagePullPolicy: Always
           env:
             - name: DATASET_OPERATOR_NAMESPACE
@@ -1020,7 +1020,7 @@ spec:
       containers:
         - name: dataset-operator
           # Replace this with the built image name
-          image: "quay.io/datashim-io/dataset-operator:latest"
+          image: "quay.io/datashim-io/dataset-operator:0.3.0"
           command:
             - /manager
           imagePullPolicy: Always
diff --git a/release-tools/manifests/dlf-oc.yaml b/release-tools/manifests/dlf-oc.yaml
index b5ea4b56..8c74df80 100644
--- a/release-tools/manifests/dlf-oc.yaml
+++ b/release-tools/manifests/dlf-oc.yaml
@@ -1012,7 +1012,7 @@ spec:
       serviceAccountName: dataset-operator
       initContainers:
         - name: generate-keys
-          image: "quay.io/datashim-io/generate-keys:latest"
+          image: "quay.io/datashim-io/generate-keys:0.3.0"
           imagePullPolicy: Always
           env:
             - name: DATASET_OPERATOR_NAMESPACE
@@ -1020,7 +1020,7 @@ spec:
       containers:
         - name: dataset-operator
           # Replace this with the built image name
-          image: "quay.io/datashim-io/dataset-operator:latest"
+          image: "quay.io/datashim-io/dataset-operator:0.3.0"
           command:
             - /manager
           imagePullPolicy: Always
diff --git a/release-tools/manifests/dlf.yaml b/release-tools/manifests/dlf.yaml
index aae92807..ae5b0abe 100644
--- a/release-tools/manifests/dlf.yaml
+++ b/release-tools/manifests/dlf.yaml
@@ -1012,7 +1012,7 @@ spec:
       serviceAccountName: dataset-operator
       initContainers:
         - name: generate-keys
-          image: "quay.io/datashim-io/generate-keys:latest"
+          image: "quay.io/datashim-io/generate-keys:0.3.0"
           imagePullPolicy: Always
           env:
             - name: DATASET_OPERATOR_NAMESPACE
@@ -1020,7 +1020,7 @@ spec:
       containers:
         - name: dataset-operator
           # Replace this with the built image name
-          image: "quay.io/datashim-io/dataset-operator:latest"
+          image: "quay.io/datashim-io/dataset-operator:0.3.0"
           command:
             - /manager
           imagePullPolicy: Always