3 files changed, 9 insertions, 17 deletions
diff --git a/kubernetes/aaf/components/aaf-cm/Chart.yaml b/kubernetes/aaf/components/aaf-cm/Chart.yaml
index ed453f7ac7..e674facdeb 100644
--- a/kubernetes/aaf/components/aaf-cm/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-cm/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP AAF Certificate Manager
 name: aaf-cm
-version: 6.0.0
+version: 7.0.0
diff --git a/kubernetes/aaf/components/aaf-cm/requirements.yaml b/kubernetes/aaf/components/aaf-cm/requirements.yaml
index 5f07f2792f..85e9d72488 100644
--- a/kubernetes/aaf/components/aaf-cm/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-cm/requirements.yaml
@@ -1,4 +1,4 @@
-# Copyright © 2020 Orange
+ # Copyright © 2020 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,10 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-dependencies:
+ dependencies:
   - name: common
-    version: ~6.x-0
+    version: ~7.x-0
+    repository: '@local'
+  - name: repositoryGenerator
+    version: ~7.x-0
     repository: '@local'
   - name: aaf-templates
-    version: ~6.x-0
+    version: ~7.x-0
     repository: 'file://../aaf-templates'
diff --git a/kubernetes/aaf/components/aaf-cm/values.yaml b/kubernetes/aaf/components/aaf-cm/values.yaml
index e75abafb0e..964b5c1002 100644
--- a/kubernetes/aaf/components/aaf-cm/values.yaml
+++ b/kubernetes/aaf/components/aaf-cm/values.yaml
@@ -15,24 +15,13 @@
 
 global:
   nodePortPrefix: 302
-  # Readiness image
-  readinessImage: onap/oom/readiness:3.0.1
-  # Ubuntu Init image
-  ubuntuInitRepository: docker.io
-  ubuntuInitImage: oomk8s/ubuntu-init:2.0.0
-  # Logging image
-  loggingRepository: docker.elastic.co
-  loggingImage: beats/filebeat:5.5.0
-  # BusyBox image
-  busyboxRepository: docker.io
-  busyboxImage: library/busybox:1.31
   persistence:
     enabled: true
   # Standard OOM
   pullPolicy: "Always"
-  repository: "nexus3.onap.org:10001"
 
   aaf:
+    image: onap/aaf/aaf_core:2.1.23
     config:
       image: onap/aaf/aaf_config:2.1.23