diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv
index 224a168..626cb4d 100644
--- a/version-manifest/src/main/resources/docker-manifest.csv
+++ b/version-manifest/src/main/resources/docker-manifest.csv
@@ -1,13 +1,13 @@
 image,tag
-onap/aaf/aaf_agent,2.1.7
-onap/aaf/aaf_cm,2.1.7
-onap/aaf/aaf_config,2.1.7
-onap/aaf/aaf_fs,2.1.7
-onap/aaf/aaf_gui,2.1.7
-onap/aaf/aaf_hello,2.1.7
-onap/aaf/aaf_locate,2.1.7
-onap/aaf/aaf_oauth,2.1.7
-onap/aaf/aaf_service,2.1.7
+onap/aaf/aaf_agent,2.1.8
+onap/aaf/aaf_cm,2.1.8
+onap/aaf/aaf_config,2.1.8
+onap/aaf/aaf_fs,2.1.8
+onap/aaf/aaf_gui,2.1.8
+onap/aaf/aaf_hello,2.1.8
+onap/aaf/aaf_locate,2.1.8
+onap/aaf/aaf_oauth,2.1.8
+onap/aaf/aaf_service,2.1.8
 onap/aaf/abrmd,3.0.0
 onap/aaf/distcenter,3.0.0
 onap/aaf/sms,3.0.1
diff --git a/version-manifest/src/main/resources/java-manifest.csv b/version-manifest/src/main/resources/java-manifest.csv
index fef503d..577408c 100644
--- a/version-manifest/src/main/resources/java-manifest.csv
+++ b/version-manifest/src/main/resources/java-manifest.csv
@@ -1,28 +1,28 @@
 groupId,artifactId,version
-org.onap.aaf.authz,aaf-auth-batch,2.1.7
-org.onap.aaf.authz,aaf-auth-cass,2.1.7
-org.onap.aaf.authz,aaf-auth-certman,2.1.7
-org.onap.aaf.authz,aaf-auth-client,2.1.7
-org.onap.aaf.authz,aaf-auth-cmd,2.1.7
-org.onap.aaf.authz,aaf-auth-core,2.1.7
-org.onap.aaf.authz,aaf-auth-deforg,2.1.7
-org.onap.aaf.authz,aaf-auth-fs,2.1.7
-org.onap.aaf.authz,aaf-auth-gui,2.1.7
-org.onap.aaf.authz,aaf-auth-hello,2.1.7
-org.onap.aaf.authz,aaf-auth-locate,2.1.7
-org.onap.aaf.authz,aaf-auth-oauth,2.1.7
-org.onap.aaf.authz,aaf-auth-service,2.1.7
-org.onap.aaf.authz,aaf-cadi-aaf,2.1.7
-org.onap.aaf.authz,aaf-cadi-cass,2.1.7
-org.onap.aaf.authz,aaf-cadi-client,2.1.7
-org.onap.aaf.authz,aaf-cadi-core,2.1.7
-org.onap.aaf.authz,aaf-cadi-oauth-enduser,2.1.7
-org.onap.aaf.authz,aaf-cadi-shiro,2.1.2
-org.onap.aaf.authz,aaf-misc-env,2.1.7
-org.onap.aaf.authz,aaf-misc-log4j,2.1.7
-org.onap.aaf.authz,aaf-misc-rosetta,2.1.7
-org.onap.aaf.authz,aaf-misc-xgen,2.1.7
-org.onap.aaf.authz,aaf-shiro-aafrealm-osgi-bundle,2.1.2
+org.onap.aaf.authz,aaf-auth-batch,2.1.8
+org.onap.aaf.authz,aaf-auth-cass,2.1.8
+org.onap.aaf.authz,aaf-auth-certman,2.1.8
+org.onap.aaf.authz,aaf-auth-client,2.1.8
+org.onap.aaf.authz,aaf-auth-cmd,2.1.8
+org.onap.aaf.authz,aaf-auth-core,2.1.8
+org.onap.aaf.authz,aaf-auth-deforg,2.1.8
+org.onap.aaf.authz,aaf-auth-fs,2.1.8
+org.onap.aaf.authz,aaf-auth-gui,2.1.8
+org.onap.aaf.authz,aaf-auth-hello,2.1.8
+org.onap.aaf.authz,aaf-auth-locate,2.1.8
+org.onap.aaf.authz,aaf-auth-oauth,2.1.8
+org.onap.aaf.authz,aaf-auth-service,2.1.8
+org.onap.aaf.authz,aaf-cadi-aaf,2.1.8
+org.onap.aaf.authz,aaf-cadi-cass,2.1.8
+org.onap.aaf.authz,aaf-cadi-client,2.1.8
+org.onap.aaf.authz,aaf-cadi-core,2.1.8
+org.onap.aaf.authz,aaf-cadi-oauth-enduser,2.1.8
+org.onap.aaf.authz,aaf-cadi-shiro,2.1.8
+org.onap.aaf.authz,aaf-misc-env,2.1.8
+org.onap.aaf.authz,aaf-misc-log4j,2.1.8
+org.onap.aaf.authz,aaf-misc-rosetta,2.1.8
+org.onap.aaf.authz,aaf-misc-xgen,2.1.8
+org.onap.aaf.authz,aaf-shiro-aafrealm-osgi-bundle,2.1.8
 org.onap.aai,rest-client,1.3.0
 org.onap.aai,search-data-service,1.3.1
 org.onap.aai.aai-common,aai-annotations,1.3.0