Repository: apache/airavata-custos (language: python)

Issue:
Staging develop merge



Discussion / hints:

Fix patch:
diff --git a/custos-client-sdks/custos-java-clients/agent-management-client/pom.xml b/custos-client-sdks/custos-java-clients/agent-management-client/pom.xml
index 91587f81b..5150d5b0e 100644
--- a/custos-client-sdks/custos-java-clients/agent-management-client/pom.xml
+++ b/custos-client-sdks/custos-java-clients/agent-management-client/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>custos-java-clients</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/custos-client-sdks/custos-java-clients/custos-clients-core/pom.xml b/custos-client-sdks/custos-java-clients/custos-clients-core/pom.xml
index 156ea75bb..386ac476f 100644
--- a/custos-client-sdks/custos-java-clients/custos-clients-core/pom.xml
+++ b/custos-client-sdks/custos-java-clients/custos-clients-core/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>custos-java-clients</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/custos-client-sdks/custos-java-clients/group-management-client/pom.xml b/custos-client-sdks/custos-java-clients/group-management-client/pom.xml
index 9a5c1f0b6..7f4d75ebb 100644
--- a/custos-client-sdks/custos-java-clients/group-management-client/pom.xml
+++ b/custos-client-sdks/custos-java-clients/group-management-client/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>custos-java-clients</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/custos-client-sdks/custos-java-clients/identity-management-client/pom.xml b/custos-client-sdks/custos-java-clients/identity-management-client/pom.xml
index 96546d1e6..ead65197b 100644
--- a/custos-client-sdks/custos-java-clients/identity-management-client/pom.xml
+++ b/custos-client-sdks/custos-java-clients/identity-management-client/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>custos-java-clients</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/custos-client-sdks/custos-java-clients/pom.xml b/custos-client-sdks/custos-java-clients/pom.xml
index 39af75f6c..452608d95 100644
--- a/custos-client-sdks/custos-java-clients/pom.xml
+++ b/custos-client-sdks/custos-java-clients/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>custos-client-sdks</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>custos-java-clients</artifactId>
diff --git a/custos-client-sdks/custos-java-clients/resource-secret-management-client/pom.xml b/custos-client-sdks/custos-java-clients/resource-secret-management-client/pom.xml
index f6b1ac5d3..eb1b339ff 100644
--- a/custos-client-sdks/custos-java-clients/resource-secret-management-client/pom.xml
+++ b/custos-client-sdks/custos-java-clients/resource-secret-management-client/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>custos-java-clients</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/custos-client-sdks/custos-java-clients/sharing-management-client/pom.xml b/custos-client-sdks/custos-java-clients/sharing-management-client/pom.xml
index 9b58a1a52..07c38a75d 100644
--- a/custos-client-sdks/custos-java-clients/sharing-management-client/pom.xml
+++ b/custos-client-sdks/custos-java-clients/sharing-management-client/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>custos-java-clients</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/custos-client-sdks/custos-java-clients/tenant-management-client/pom.xml b/custos-client-sdks/custos-java-clients/tenant-management-client/pom.xml
index d499c8ca6..c86437af2 100644
--- a/custos-client-sdks/custos-java-clients/tenant-management-client/pom.xml
+++ b/custos-client-sdks/custos-java-clients/tenant-management-client/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>custos-java-clients</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/custos-client-sdks/custos-java-clients/user-management-client/pom.xml b/custos-client-sdks/custos-java-clients/user-management-client/pom.xml
index fb87deb74..68d5fd537 100644
--- a/custos-client-sdks/custos-java-clients/user-management-client/pom.xml
+++ b/custos-client-sdks/custos-java-clients/user-management-client/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>custos-java-clients</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/custos-client-sdks/custos-java-sdk/pom.xml b/custos-client-sdks/custos-java-sdk/pom.xml
index a9dfc39f1..ad3478dde 100644
--- a/custos-client-sdks/custos-java-sdk/pom.xml
+++ b/custos-client-sdks/custos-java-sdk/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>custos-client-sdks</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/custos-client-sdks/pom.xml b/custos-client-sdks/pom.xml
index 576c97092..47e4b62fc 100644
--- a/custos-client-sdks/pom.xml
+++ b/custos-client-sdks/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>custos</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/custos-core-services-client-stubs/agent-profile-core-service-client-stub/pom.xml b/custos-core-services-client-stubs/agent-profile-core-service-client-stub/pom.xml
index ae9e6abb9..07a07eb8d 100644
--- a/custos-core-services-client-stubs/agent-profile-core-service-client-stub/pom.xml
+++ b/custos-core-services-client-stubs/agent-profile-core-service-client-stub/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>custos-core-services-client-stubs</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/custos-core-services-client-stubs/cluster-management-core-service-client-stub/pom.xml b/custos-core-services-client-stubs/cluster-management-core-service-client-stub/pom.xml
index f87e49ca4..9ecc78cf5 100644
--- a/custos-core-services-client-stubs/cluster-management-core-service-client-stub/pom.xml
+++ b/custos-core-services-client-stubs/cluster-management-core-service-client-stub/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>custos-core-services-client-stubs</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/custos-core-services-client-stubs/credential-store-core-service-client-stubs/pom.xml b/custos-core-services-client-stubs/credential-store-core-service-client-stubs/pom.xml
index 5f876547b..ce3e7dbb2 100644
--- a/custos-core-services-client-stubs/credential-store-core-service-client-stubs/pom.xml
+++ b/custos-core-services-client-stubs/credential-store-core-service-client-stubs/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>custos-core-services-client-stubs</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/custos-core-services-client-stubs/custos-logging-client-stub/pom.xml b/custos-core-services-client-stubs/custos-logging-client-stub/pom.xml
index c66585dc7..d7a1bf8e3 100644
--- a/custos-core-services-client-stubs/custos-logging-client-stub/pom.xml
+++ b/custos-core-services-client-stubs/custos-logging-client-stub/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>custos-core-services-client-stubs</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/custos-core-services-client-stubs/federated-authentication-core-service-client-stub/pom.xml b/custos-core-services-client-stubs/federated-authentication-core-service-client-stub/pom.xml
index 0cecb8ca3..36b015cd9 100644
--- a/custos-core-services-client-stubs/federated-authentication-core-service-client-stub/pom.xml
+++ b/custos-core-services-client-stubs/federated-authentication-core-service-client-stub/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>custos-core-services-client-stubs</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/custos-core-services-client-stubs/iam-admin-core-service-client-stub/pom.xml b/custos-core-services-client-stubs/iam-admin-core-service-client-stub/pom.xml
index 989940805..35428e40e 100644
--- a/custos-core-services-client-stubs/iam-admin-core-service-client-stub/pom.xml
+++ b/custos-core-services-client-stubs/iam-admin-core-service-client-stub/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>custos-core-services-client-stubs</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/custos-core-services-client-stubs/identity-core-service-client-stub/pom.xml b/custos-core-services-client-stubs/identity-core-service-client-stub/pom.xml
index 48452a92a..b0d62c3ca 100644
--- a/custos-core-services-client-stubs/identity-core-service-client-stub/pom.xml
+++ b/custos-core-services-client-stubs/identity-core-service-client-stub/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>custos-core-services-client-stubs</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/custos-core-services-client-stubs/messaging-core-service-client-stub/pom.xml b/custos-core-services-client-stubs/messaging-core-service-client-stub/pom.xml
index fcc2f8978..5e7680c76 100644
--- a/custos-core-services-client-stubs/messaging-core-service-client-stub/pom.xml
+++ b/custos-core-services-client-stubs/messaging-core-service-client-stub/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>custos-core-services-client-stubs</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/custos-core-services-client-stubs/pom.xml b/custos-core-services-client-stubs/pom.xml
index 5a59cf65a..68498dffc 100644
--- a/custos-core-services-client-stubs/pom.xml
+++ b/custos-core-services-client-stubs/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>custos</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
diff --git a/custos-core-services-client-stubs/resource-secret-core-service-client-stub/pom.xml b/custos-core-services-client-stubs/resource-secret-core-service-client-stub/pom.xml
index b7d28ff20..8cce88a3a 100644
--- a/custos-core-services-client-stubs/resource-secret-core-service-client-stub/pom.xml
+++ b/custos-core-services-client-stubs/resource-secret-core-service-client-stub/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>custos-core-services-client-stubs</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/custos-core-services-client-stubs/sharing-core-service-client-stub/pom.xml b/custos-core-services-client-stubs/sharing-core-service-client-stub/pom.xml
index f0a6c184e..975c2a6d7 100644
--- a/custos-core-services-client-stubs/sharing-core-service-client-stub/pom.xml
+++ b/custos-core-services-client-stubs/sharing-core-service-client-stub/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>custos-core-services-client-stubs</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/custos-core-services-client-stubs/tenant-profile-core-service-client-stub/pom.xml b/custos-core-services-client-stubs/tenant-profile-core-service-client-stub/pom.xml
index 3d0b6de83..977edb08c 100644
--- a/custos-core-services-client-stubs/tenant-profile-core-service-client-stub/pom.xml
+++ b/custos-core-services-client-stubs/tenant-profile-core-service-client-stub/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>custos-core-services-client-stubs</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/custos-core-services-client-stubs/user-profile-core-service-client-stub/pom.xml b/custos-core-services-client-stubs/user-profile-core-service-client-stub/pom.xml
index 718de294a..bce420fc3 100644
--- a/custos-core-services-client-stubs/user-profile-core-service-client-stub/pom.xml
+++ b/custos-core-services-client-stubs/user-profile-core-service-client-stub/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>custos-core-services-client-stubs</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/custos-core-services/agent-profile-core-service/pom.xml b/custos-core-services/agent-profile-core-service/pom.xml
index 6c4ca1f19..cf04aedc7 100644
--- a/custos-core-services/agent-profile-core-service/pom.xml
+++ b/custos-core-services/agent-profile-core-service/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>custos-core-services</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -116,6 +116,13 @@
                     <skip>false</skip>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <configuration>
+                    <skip>false</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/custos-core-services/agent-profile-core-service/src/main/helm/templates/deployment.yaml b/custos-core-services/agent-profile-core-service/src/main/helm/templates/deployment.yaml
index ab67be6f0..9bde73ad1 100644
--- a/custos-core-services/agent-profile-core-service/src/main/helm/templates/deployment.yaml
+++ b/custos-core-services/agent-profile-core-service/src/main/helm/templates/deployment.yaml
@@ -47,9 +47,9 @@ spec:
             httpGet:
               path: /actuator/health
               port: 8080
-              initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
-              periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
-              successThreshold: {{ .Values.readinessProbe.successThreshold }}
+            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+            successThreshold: {{ .Values.readinessProbe.successThreshold }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}
diff --git a/custos-core-services/agent-profile-core-service/src/main/resources/application.properties b/custos-core-services/agent-profile-core-service/src/main/resources/application.properties
index b43627df4..34bb882ad 100644
--- a/custos-core-services/agent-profile-core-service/src/main/resources/application.properties
+++ b/custos-core-services/agent-profile-core-service/src/main/resources/application.properties
@@ -27,7 +27,7 @@ management.security.enabled=false
 management.endpoints.web.exposure.include=*
 management.endpoint.metrics.enabled=true
 
-spring.datasource.url = jdbc:mysql://mysql-primary.custos.svc.cluster.local:3306/core_agent_profile?useSSL=false&serverTimezone=UTC&useLegacyDatetimeCode=false
+spring.datasource.url = jdbc:mysql://mysql-primary.custos.svc.cluster.local:3306/core_agent_profile?useSSL=false&serverTimezone=UTC&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true
 spring.datasource.username = root
 spring.datasource.password = root
 
@@ -37,4 +37,5 @@ spring.datasource.password = root
 spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5InnoDBDialect
 spring.jpa.properties.hibernate.enable_lazy_load_no_trans=true
 # Hibernate ddl auto (create, create-drop, validate, update)
-spring.jpa.hibernate.ddl-auto = update
\ No newline at end of file
+spring.jpa.hibernate.ddl-auto = update
+spring.profiles.active=@spring.profiles.active@
\ No newline at end of file
diff --git a/custos-core-services/cluster-management-core-service/pom.xml b/custos-core-services/cluster-management-core-service/pom.xml
index eb514716c..a545d8d30 100644
--- a/custos-core-services/cluster-management-core-service/pom.xml
+++ b/custos-core-services/cluster-management-core-service/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>custos-core-services</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -117,6 +117,13 @@
                     <skip>false</skip>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <configuration>
+                    <skip>false</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/custos-core-services/cluster-management-core-service/src/main/helm/templates/deployment.yaml b/custos-core-services/cluster-management-core-service/src/main/helm/templates/deployment.yaml
index ab67be6f0..9bde73ad1 100644
--- a/custos-core-services/cluster-management-core-service/src/main/helm/templates/deployment.yaml
+++ b/custos-core-services/cluster-management-core-service/src/main/helm/templates/deployment.yaml
@@ -47,9 +47,9 @@ spec:
             httpGet:
               path: /actuator/health
               port: 8080
-              initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
-              periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
-              successThreshold: {{ .Values.readinessProbe.successThreshold }}
+            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+            successThreshold: {{ .Values.readinessProbe.successThreshold }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}
diff --git a/custos-core-services/cluster-management-core-service/src/main/java/org/apache/custos/cluster/management/service/ClusterManagementService.java b/custos-core-services/cluster-management-core-service/src/main/java/org/apache/custos/cluster/management/service/ClusterManagementService.java
index 29ac7147c..890da4722 100644
--- a/custos-core-services/cluster-management-core-service/src/main/java/org/apache/custos/cluster/management/service/ClusterManagementService.java
+++ b/custos-core-services/cluster-management-core-service/src/main/java/org/apache/custos/cluster/management/service/ClusterManagementService.java
@@ -63,7 +63,12 @@ public void getCustosServerCertificate(org.apache.custos.cluster.management.serv
             // the CoreV1Api loads default api-client from global configuration.
             CoreV1Api api = new CoreV1Api();
 
-            V1Secret secret = api.readNamespacedSecret(custosServerSecretName, custosNameSpace, null, null, null);
+            String namespace = request.getNamespace();
+            String secretName = request.getSecretName();
+
+
+            V1Secret secret = api.readNamespacedSecret(secretName.isEmpty() ? custosServerSecretName : secretName,
+                    namespace.isEmpty() ? custosNameSpace : namespace, null, null, null);
             Map<String, byte[]> map = secret.getData();
             byte[] cert = map.get("tls.crt");
             if (cert == null || cert.length == 0) {
diff --git a/custos-core-services/cluster-management-core-service/src/main/resources/application.properties b/custos-core-services/cluster-management-core-service/src/main/resources/application.properties
index 1a2e97cbf..621b2da54 100644
--- a/custos-core-services/cluster-management-core-service/src/main/resources/application.properties
+++ b/custos-core-services/cluster-management-core-service/src/main/resources/application.properties
@@ -27,7 +27,7 @@ management.security.enabled=false
 management.endpoints.web.exposure.include=*
 management.endpoint.metrics.enabled=true
 
-spring.datasource.url = jdbc:mysql://mysql-primary.custos.svc.cluster.local:3306/core_cluster_manager?useSSL=false&serverTimezone=UTC&useLegacyDatetimeCode=false
+spring.datasource.url = jdbc:mysql://mysql-primary.custos.svc.cluster.local:3306/core_cluster_manager?useSSL=false&serverTimezone=UTC&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true
 spring.datasource.username = root
 spring.datasource.password = root
 
@@ -37,4 +37,5 @@ spring.datasource.password = root
 spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5InnoDBDialect
 spring.jpa.properties.hibernate.enable_lazy_load_no_trans=true
 # Hibernate ddl auto (create, create-drop, validate, update)
-spring.jpa.hibernate.ddl-auto = update
\ No newline at end of file
+spring.jpa.hibernate.ddl-auto = update
+spring.profiles.active=@spring.profiles.active@
\ No newline at end of file
diff --git a/custos-core-services/credential-store-core-service/Dockerfile b/custos-core-services/credential-store-core-service/Dockerfile
index 8007b966e..ea0f353e6 100644
--- a/custos-core-services/credential-store-core-service/Dockerfile
+++ b/custos-core-services/credential-store-core-service/Dockerfile
@@ -1,4 +1,5 @@
 FROM openjdk:11.0.5-jdk-slim
+COPY src/main/resources/vault-client-truststore.pkcs12 /home/ubuntu/vault-client-truststore.pkcs12
 VOLUME /tmp
 ARG JAR_FILE
 ADD ${JAR_FILE} app.jar
diff --git a/custos-core-services/credential-store-core-service/pom.xml b/custos-core-services/credential-store-core-service/pom.xml
index 75a354e63..6cc6d6ee0 100644
--- a/custos-core-services/credential-store-core-service/pom.xml
+++ b/custos-core-services/credential-store-core-service/pom.xml
@@ -24,13 +24,12 @@
     <parent>
         <artifactId>custos-core-services</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>credential-store-core-service</artifactId>
     <dependencies>
-
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>custos-core-services-commons</artifactId>
@@ -64,7 +63,6 @@
             <groupId>io.zipkin.brave</groupId>
             <artifactId>brave-instrumentation-grpc</artifactId>
         </dependency>
-
         <dependency>
             <groupId>io.grpc</groupId>
             <artifactId>grpc-stub</artifactId>
@@ -77,7 +75,6 @@
             <groupId>io.grpc</groupId>
             <artifactId>grpc-netty</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
@@ -108,6 +105,13 @@
                     <skip>false</skip>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <configuration>
+                    <skip>false</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/custos-core-services/credential-store-core-service/src/main/helm/templates/deployment.yaml b/custos-core-services/credential-store-core-service/src/main/helm/templates/deployment.yaml
index 31e54a6fc..74401f2c4 100644
--- a/custos-core-services/credential-store-core-service/src/main/helm/templates/deployment.yaml
+++ b/custos-core-services/credential-store-core-service/src/main/helm/templates/deployment.yaml
@@ -6,9 +6,10 @@ metadata:
 {{ include "helm.labels" . | indent 4 }}
 spec:
   replicas: {{ .Values.replicaCount }}
-  rollingUpdate:
-    maxSurge: {{ .Values.rollingUpdate.maxSurge }}
-    maxUnavailable: {{ .Values.rollingUpdate.maxUnavailable }}
+  strategy:
+    rollingUpdate:
+      maxSurge: {{ .Values.rollingUpdate.maxSurge }}
+      maxUnavailable: {{ .Values.rollingUpdate.maxUnavailable }}
   selector:
     matchLabels:
       app.kubernetes.io/name: {{ include "helm.name" . }}
@@ -45,9 +46,9 @@ spec:
             httpGet:
               path: /actuator/health
               port: 8080
-              initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
-              periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
-              successThreshold: {{ .Values.readinessProbe.successThreshold }}
+            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+            successThreshold: {{ .Values.readinessProbe.successThreshold }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}
diff --git a/custos-core-services/credential-store-core-service/src/main/resources/application.properties b/custos-core-services/credential-store-core-service/src/main/resources/application.properties
index 6f3c54b83..350fc41c0 100644
--- a/custos-core-services/credential-store-core-service/src/main/resources/application.properties
+++ b/custos-core-services/credential-store-core-service/src/main/resources/application.properties
@@ -27,7 +27,7 @@ management.endpoints.web.exposure.include=*
 management.endpoint.metrics.enabled=true
 
 
-spring.datasource.url = jdbc:mysql://mysql-primary.custos.svc.cluster.local:3306/core_credential_store?useSSL=false&serverTimezone=UTC&useLegacyDatetimeCode=false
+spring.datasource.url = jdbc:mysql://mysql-primary.custos.svc.cluster.local:3306/core_credential_store?useSSL=false&serverTimezone=UTC&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true
 spring.datasource.username = root
 spring.datasource.password = root
 
@@ -37,4 +37,5 @@ spring.datasource.password = root
 spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5InnoDBDialect
 
 # Hibernate ddl auto (create, create-drop, validate, update)
-spring.jpa.hibernate.ddl-auto = update
\ No newline at end of file
+spring.jpa.hibernate.ddl-auto = update
+spring.profiles.active=@spring.profiles.active@
\ No newline at end of file
diff --git a/custos-core-services/credential-store-core-service/src/main/resources/bootstrap.properties b/custos-core-services/credential-store-core-service/src/main/resources/bootstrap.properties
index 6e966e185..cb3a49eb7 100644
--- a/custos-core-services/credential-store-core-service/src/main/resources/bootstrap.properties
+++ b/custos-core-services/credential-store-core-service/src/main/resources/bootstrap.properties
@@ -16,12 +16,11 @@
 #  specific language governing permissions and limitations
 #  under the License
 
-spring.cloud.vault.token=s.Pnt4HWJ25JYDhii1YFEfQBQq
-spring.cloud.vault.scheme=https
-spring.cloud.vault.host=vault.custos.scigap.org
-spring.cloud.vault.port=31190
-spring.cloud.vault.uri=https://vault.custos.scigap.org:31190
+spring.cloud.vault.token=${vault.token}
+spring.cloud.vault.scheme=${vault.scheme}
+spring.cloud.vault.host=${vault.host}
+spring.cloud.vault.port=${vault.port}
+spring.cloud.vault.uri=${vault.uri}
 spring.cloud.vault.authentication=token
-spring.cloud.vault.ssl.trust-store=vault-client-truststore.pkcs12
-spring.cloud.vault.ssl.trust-store-password=vaultpass
-
+spring.cloud.vault.ssl.trust-store=file:home/ubuntu/vault-client-truststore.pkcs12
+spring.cloud.vault.ssl.trust-store-password=vaultpass
\ No newline at end of file
diff --git a/custos-core-services/credential-store-core-service/src/main/resources/vault-client-truststore.pkcs12 b/custos-core-services/credential-store-core-service/src/main/resources/vault-client-truststore.pkcs12
index ec1e989cc..fb88917d1 100644
Binary files a/custos-core-services/credential-store-core-service/src/main/resources/vault-client-truststore.pkcs12 and b/custos-core-services/credential-store-core-service/src/main/resources/vault-client-truststore.pkcs12 differ
diff --git a/custos-core-services/custos-core-services-commons/pom.xml b/custos-core-services/custos-core-services-commons/pom.xml
index 1135ea24b..91cebcf66 100644
--- a/custos-core-services/custos-core-services-commons/pom.xml
+++ b/custos-core-services/custos-core-services-commons/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>custos-core-services</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/custos-core-services/custos-logging/pom.xml b/custos-core-services/custos-logging/pom.xml
index 5bf6aff27..9b6e78a5c 100644
--- a/custos-core-services/custos-logging/pom.xml
+++ b/custos-core-services/custos-logging/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>custos-core-services</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -94,6 +94,7 @@
             <groupId>javax.persistence</groupId>
             <artifactId>persistence-api</artifactId>
         </dependency>
+
     </dependencies>
 
 
@@ -113,6 +114,13 @@
                     <skip>false</skip>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <configuration>
+                    <skip>false</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/custos-core-services/custos-logging/src/main/helm/templates/deployment.yaml b/custos-core-services/custos-logging/src/main/helm/templates/deployment.yaml
index 31e54a6fc..74401f2c4 100644
--- a/custos-core-services/custos-logging/src/main/helm/templates/deployment.yaml
+++ b/custos-core-services/custos-logging/src/main/helm/templates/deployment.yaml
@@ -6,9 +6,10 @@ metadata:
 {{ include "helm.labels" . | indent 4 }}
 spec:
   replicas: {{ .Values.replicaCount }}
-  rollingUpdate:
-    maxSurge: {{ .Values.rollingUpdate.maxSurge }}
-    maxUnavailable: {{ .Values.rollingUpdate.maxUnavailable }}
+  strategy:
+    rollingUpdate:
+      maxSurge: {{ .Values.rollingUpdate.maxSurge }}
+      maxUnavailable: {{ .Values.rollingUpdate.maxUnavailable }}
   selector:
     matchLabels:
       app.kubernetes.io/name: {{ include "helm.name" . }}
@@ -45,9 +46,9 @@ spec:
             httpGet:
               path: /actuator/health
               port: 8080
-              initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
-              periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
-              successThreshold: {{ .Values.readinessProbe.successThreshold }}
+            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+            successThreshold: {{ .Values.readinessProbe.successThreshold }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}
diff --git a/custos-core-services/custos-logging/src/main/resources/application.properties b/custos-core-services/custos-logging/src/main/resources/application.properties
index a56cab7b4..e432bf10e 100644
--- a/custos-core-services/custos-logging/src/main/resources/application.properties
+++ b/custos-core-services/custos-logging/src/main/resources/application.properties
@@ -28,7 +28,7 @@ management.endpoints.web.exposure.include=*
 management.endpoint.metrics.enabled=true
 
 
-spring.datasource.url = jdbc:mysql://mysql-primary.custos.svc.cluster.local:3306/core_logging?useSSL=false&serverTimezone=UTC&useLegacyDatetimeCode=false
+spring.datasource.url = jdbc:mysql://mysql-primary.custos.svc.cluster.local:3306/core_logging?useSSL=false&serverTimezone=UTC&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true
 spring.datasource.username = root
 spring.datasource.password = root
 
@@ -38,4 +38,5 @@ spring.datasource.password = root
 spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5InnoDBDialect
 
 # Hibernate ddl auto (create, create-drop, validate, update)
-spring.jpa.hibernate.ddl-auto = update
\ No newline at end of file
+spring.jpa.hibernate.ddl-auto = update
+spring.profiles.active=@spring.profiles.active@
\ No newline at end of file
diff --git a/custos-core-services/custos-logging/src/main/resources/bootstrap.properties b/custos-core-services/custos-logging/src/main/resources/bootstrap.properties
index fd0bbe03e..5edf06315 100644
--- a/custos-core-services/custos-logging/src/main/resources/bootstrap.properties
+++ b/custos-core-services/custos-logging/src/main/resources/bootstrap.properties
@@ -18,4 +18,4 @@
 #
 
 spring.cloud.config.uri=http://custos-configuration-service.custos.svc.cluster.local:9000
-spring.profiles.active:default
\ No newline at end of file
+spring.profiles.active=@spring.profiles.active@
\ No newline at end of file
diff --git a/custos-core-services/custos-messaging-core-service/pom.xml b/custos-core-services/custos-messaging-core-service/pom.xml
index 89c8f3254..5e1ad6d71 100644
--- a/custos-core-services/custos-messaging-core-service/pom.xml
+++ b/custos-core-services/custos-messaging-core-service/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>custos-core-services</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -112,7 +112,7 @@
         <dependency>
             <groupId>org.apache.custos</groupId>
             <artifactId>user-profile-core-service-client-stub</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>1.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -144,6 +144,13 @@
                     <skip>false</skip>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <configuration>
+                    <skip>false</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/custos-core-services/custos-messaging-core-service/src/main/helm/templates/deployment.yaml b/custos-core-services/custos-messaging-core-service/src/main/helm/templates/deployment.yaml
index 31e54a6fc..74401f2c4 100644
--- a/custos-core-services/custos-messaging-core-service/src/main/helm/templates/deployment.yaml
+++ b/custos-core-services/custos-messaging-core-service/src/main/helm/templates/deployment.yaml
@@ -6,9 +6,10 @@ metadata:
 {{ include "helm.labels" . | indent 4 }}
 spec:
   replicas: {{ .Values.replicaCount }}
-  rollingUpdate:
-    maxSurge: {{ .Values.rollingUpdate.maxSurge }}
-    maxUnavailable: {{ .Values.rollingUpdate.maxUnavailable }}
+  strategy:
+    rollingUpdate:
+      maxSurge: {{ .Values.rollingUpdate.maxSurge }}
+      maxUnavailable: {{ .Values.rollingUpdate.maxUnavailable }}
   selector:
     matchLabels:
       app.kubernetes.io/name: {{ include "helm.name" . }}
@@ -45,9 +46,9 @@ spec:
             httpGet:
               path: /actuator/health
               port: 8080
-              initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
-              periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
-              successThreshold: {{ .Values.readinessProbe.successThreshold }}
+            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+            successThreshold: {{ .Values.readinessProbe.successThreshold }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}
diff --git a/custos-core-services/custos-messaging-core-service/src/main/resources/application.properties b/custos-core-services/custos-messaging-core-service/src/main/resources/application.properties
index 1deacc718..09c0cd00c 100644
--- a/custos-core-services/custos-messaging-core-service/src/main/resources/application.properties
+++ b/custos-core-services/custos-messaging-core-service/src/main/resources/application.properties
@@ -38,4 +38,5 @@ spring.datasource.password = root
 spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5InnoDBDialect
 
 # Hibernate ddl auto (create, create-drop, validate, update)
-spring.jpa.hibernate.ddl-auto = update
\ No newline at end of file
+spring.jpa.hibernate.ddl-auto = update
+spring.profiles.active=@spring.profiles.active@
\ No newline at end of file
diff --git a/custos-core-services/custos-messaging-core-service/src/main/resources/bootstrap.properties b/custos-core-services/custos-messaging-core-service/src/main/resources/bootstrap.properties
index fd0bbe03e..c6576723e 100644
--- a/custos-core-services/custos-messaging-core-service/src/main/resources/bootstrap.properties
+++ b/custos-core-services/custos-messaging-core-service/src/main/resources/bootstrap.properties
@@ -17,5 +17,6 @@
 #  under the License.
 #
 
+
 spring.cloud.config.uri=http://custos-configuration-service.custos.svc.cluster.local:9000
-spring.profiles.active:default
\ No newline at end of file
+spring.profiles.active=@spring.profiles.active@
\ No newline at end of file
diff --git a/custos-core-services/federated-authentication-core-service/pom.xml b/custos-core-services/federated-authentication-core-service/pom.xml
index fcfba0038..48d8bf515 100644
--- a/custos-core-services/federated-authentication-core-service/pom.xml
+++ b/custos-core-services/federated-authentication-core-service/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>custos-core-services</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -99,6 +99,7 @@
             <groupId>javax.persistence</groupId>
             <artifactId>persistence-api</artifactId>
         </dependency>
+
     </dependencies>
 
 
@@ -118,6 +119,36 @@
                     <skip>false</skip>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <configuration>
+                    <skip>false</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <configuration>
+                    <target>
+                        <!-- keyfile+passphrase or  password, choose one -->
+                        <!--
+                        <scp localFile="${project.basedir}/target/qos-spark-1.0.jar"
+                          remoteToFile="root@192.168.203.156:/usr/sanss" verbose="true"
+                          keyfile="C:\Users\shengw\.ssh\192.168.203.156\id_rsa"
+                          passphrase="">
+                        </scp>
+                         -->
+                        <scp localFile="${project.basedir}/target/helm/${project.artifactId}-${project.version}.tgz"
+                             remoteToFile="ubuntu@${host}:/home/ubuntu/custos/artifacts"
+                             verbose="true"
+                             keyfile="/Users/isururanawaka/.ssh/custos/id_rsa"
+                             passphrase="isjarana" trust="true">
+                        </scp>
+                    </target>
+                    <skip>false</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/custos-core-services/federated-authentication-core-service/src/main/helm/templates/deployment.yaml b/custos-core-services/federated-authentication-core-service/src/main/helm/templates/deployment.yaml
index 31e54a6fc..74401f2c4 100644
--- a/custos-core-services/federated-authentication-core-service/src/main/helm/templates/deployment.yaml
+++ b/custos-core-services/federated-authentication-core-service/src/main/helm/templates/deployment.yaml
@@ -6,9 +6,10 @@ metadata:
 {{ include "helm.labels" . | indent 4 }}
 spec:
   replicas: {{ .Values.replicaCount }}
-  rollingUpdate:
-    maxSurge: {{ .Values.rollingUpdate.maxSurge }}
-    maxUnavailable: {{ .Values.rollingUpdate.maxUnavailable }}
+  strategy:
+    rollingUpdate:
+      maxSurge: {{ .Values.rollingUpdate.maxSurge }}
+      maxUnavailable: {{ .Values.rollingUpdate.maxUnavailable }}
   selector:
     matchLabels:
       app.kubernetes.io/name: {{ include "helm.name" . }}
@@ -45,9 +46,9 @@ spec:
             httpGet:
               path: /actuator/health
               port: 8080
-              initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
-              periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
-              successThreshold: {{ .Values.readinessProbe.successThreshold }}
+            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+            successThreshold: {{ .Values.readinessProbe.successThreshold }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}
diff --git a/custos-core-services/federated-authentication-core-service/src/main/resources/application.properties b/custos-core-services/federated-authentication-core-service/src/main/resources/application.properties
index 70fece97f..496054ea9 100644
--- a/custos-core-services/federated-authentication-core-service/src/main/resources/application.properties
+++ b/custos-core-services/federated-authentication-core-service/src/main/resources/application.properties
@@ -28,7 +28,7 @@ management.endpoints.web.exposure.include=*
 management.endpoint.metrics.enabled=true
 
 
-spring.datasource.url = jdbc:mysql://mysql-primary.custos.svc.cluster.local:3306/core_federated_authentication?useSSL=false&serverTimezone=UTC&useLegacyDatetimeCode=false
+spring.datasource.url = jdbc:mysql://mysql-primary.custos.svc.cluster.local:3306/core_federated_authentication?useSSL=false&serverTimezone=UTC&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true
 spring.datasource.username = root
 spring.datasource.password = root
 
@@ -39,3 +39,4 @@ spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5InnoDBDial
 
 # Hibernate ddl auto (create, create-drop, validate, update)
 spring.jpa.hibernate.ddl-auto = update
+spring.profiles.active=@spring.profiles.active@
\ No newline at end of file
diff --git a/custos-core-services/federated-authentication-core-service/src/main/resources/bootstrap.properties b/custos-core-services/federated-authentication-core-service/src/main/resources/bootstrap.properties
index 760bf9291..b6f70dc30 100644
--- a/custos-core-services/federated-authentication-core-service/src/main/resources/bootstrap.properties
+++ b/custos-core-services/federated-authentication-core-service/src/main/resources/bootstrap.properties
@@ -18,4 +18,4 @@
 #
 
 spring.cloud.config.uri=http://custos-configuration-service.custos.svc.cluster.local:9000
-spring.profiles.active:default
\ No newline at end of file
+spring.profiles.active=@spring.profiles.active@
\ No newline at end of file
diff --git a/custos-core-services/iam-admin-core-service/Dockerfile b/custos-core-services/iam-admin-core-service/Dockerfile
index 403f1d394..2289bb510 100644
--- a/custos-core-services/iam-admin-core-service/Dockerfile
+++ b/custos-core-services/iam-admin-core-service/Dockerfile
@@ -3,4 +3,4 @@ COPY src/main/resources/keycloak-client-truststore.pkcs12 /home/ubuntu/keystore/
 VOLUME /tmp
 ARG JAR_FILE
 ADD ${JAR_FILE} app.jar
-ENTRYPOINT ["java","-Djavax.net.debug=ssl:handshake:verbose:keymanager:trustmanager -Djava.security.debug=access:stack -Dhttps.protocols=TLSv1,TLSv1.1,TLSv1.2","-jar","/app.jar"]
\ No newline at end of file
+ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"]
\ No newline at end of file
diff --git a/custos-core-services/iam-admin-core-service/pom.xml b/custos-core-services/iam-admin-core-service/pom.xml
index 5201c4cf3..34de9b1b1 100644
--- a/custos-core-services/iam-admin-core-service/pom.xml
+++ b/custos-core-services/iam-admin-core-service/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>custos-core-services</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -85,9 +85,6 @@
             <groupId>io.micrometer</groupId>
             <artifactId>micrometer-registry-prometheus</artifactId>
         </dependency>
-
-
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
@@ -100,6 +97,7 @@
             <groupId>javax.persistence</groupId>
             <artifactId>persistence-api</artifactId>
         </dependency>
+
     </dependencies>
 
 
@@ -119,6 +117,13 @@
                     <skip>false</skip>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <configuration>
+                    <skip>false</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/custos-core-services/iam-admin-core-service/src/main/helm/templates/deployment.yaml b/custos-core-services/iam-admin-core-service/src/main/helm/templates/deployment.yaml
index 31e54a6fc..74401f2c4 100644
--- a/custos-core-services/iam-admin-core-service/src/main/helm/templates/deployment.yaml
+++ b/custos-core-services/iam-admin-core-service/src/main/helm/templates/deployment.yaml
@@ -6,9 +6,10 @@ metadata:
 {{ include "helm.labels" . | indent 4 }}
 spec:
   replicas: {{ .Values.replicaCount }}
-  rollingUpdate:
-    maxSurge: {{ .Values.rollingUpdate.maxSurge }}
-    maxUnavailable: {{ .Values.rollingUpdate.maxUnavailable }}
+  strategy:
+    rollingUpdate:
+      maxSurge: {{ .Values.rollingUpdate.maxSurge }}
+      maxUnavailable: {{ .Values.rollingUpdate.maxUnavailable }}
   selector:
     matchLabels:
       app.kubernetes.io/name: {{ include "helm.name" . }}
@@ -45,9 +46,9 @@ spec:
             httpGet:
               path: /actuator/health
               port: 8080
-              initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
-              periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
-              successThreshold: {{ .Values.readinessProbe.successThreshold }}
+            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+            successThreshold: {{ .Values.readinessProbe.successThreshold }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}
diff --git a/custos-core-services/iam-admin-core-service/src/main/resources/application.properties b/custos-core-services/iam-admin-core-service/src/main/resources/application.properties
index 9169a6a10..b390e085f 100644
--- a/custos-core-services/iam-admin-core-service/src/main/resources/application.properties
+++ b/custos-core-services/iam-admin-core-service/src/main/resources/application.properties
@@ -28,7 +28,7 @@ management.endpoints.web.exposure.include=*
 management.endpoint.metrics.enabled=true
 
 
-spring.datasource.url = jdbc:mysql://mysql-primary.custos.svc.cluster.local:3306/core_iam?useSSL=false&serverTimezone=UTC&useLegacyDatetimeCode=false
+spring.datasource.url = jdbc:mysql://mysql-primary.custos.svc.cluster.local:3306/core_iam?useSSL=false&serverTimezone=UTC&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true
 spring.datasource.username = root
 spring.datasource.password = root
 
@@ -38,4 +38,5 @@ spring.datasource.password = root
 spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5InnoDBDialect
 
 # Hibernate ddl auto (create, create-drop, validate, update)
-spring.jpa.hibernate.ddl-auto = update
\ No newline at end of file
+spring.jpa.hibernate.ddl-auto = update
+spring.profiles.active=@spring.profiles.active@
\ No newline at end of file
diff --git a/custos-core-services/iam-admin-core-service/src/main/resources/bootstrap.properties b/custos-core-services/iam-admin-core-service/src/main/resources/bootstrap.properties
index 760bf9291..b6f70dc30 100644
--- a/custos-core-services/iam-admin-core-service/src/main/resources/bootstrap.properties
+++ b/custos-core-services/iam-admin-core-service/src/main/resources/bootstrap.properties
@@ -18,4 +18,4 @@
 #
 
 spring.cloud.config.uri=http://custos-configuration-service.custos.svc.cluster.local:9000
-spring.profiles.active:default
\ No newline at end of file
+spring.profiles.active=@spring.profiles.active@
\ No newline at end of file
diff --git a/custos-core-services/identity-core-service/Dockerfile b/custos-core-services/identity-core-service/Dockerfile
index 810e6e8c4..2289bb510 100644
--- a/custos-core-services/identity-core-service/Dockerfile
+++ b/custos-core-services/identity-core-service/Dockerfile
@@ -3,4 +3,4 @@ COPY src/main/resources/keycloak-client-truststore.pkcs12 /home/ubuntu/keystore/
 VOLUME /tmp
 ARG JAR_FILE
 ADD ${JAR_FILE} app.jar
-ENTRYPOINT ["java","-Djavax.net.debug=ssl:handshake:verbose:keymanager:trustmanager -Djava.security.debug=access:stack  -Dhttps.protocols=TLSv1,TLSv1.1,TLSv1.2","-jar","/app.jar"]
\ No newline at end of file
+ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"]
\ No newline at end of file
diff --git a/custos-core-services/identity-core-service/pom.xml b/custos-core-services/identity-core-service/pom.xml
index 0d9c7ee52..6e5c720b8 100644
--- a/custos-core-services/identity-core-service/pom.xml
+++ b/custos-core-services/identity-core-service/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>custos-core-services</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -103,6 +103,7 @@
             <groupId>javax.persistence</groupId>
             <artifactId>persistence-api</artifactId>
         </dependency>
+
     </dependencies>
 
 
@@ -122,6 +123,13 @@
                     <skip>false</skip>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <configuration>
+                    <skip>false</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/custos-core-services/identity-core-service/src/main/helm/templates/deployment.yaml b/custos-core-services/identity-core-service/src/main/helm/templates/deployment.yaml
index 31e54a6fc..74401f2c4 100644
--- a/custos-core-services/identity-core-service/src/main/helm/templates/deployment.yaml
+++ b/custos-core-services/identity-core-service/src/main/helm/templates/deployment.yaml
@@ -6,9 +6,10 @@ metadata:
 {{ include "helm.labels" . | indent 4 }}
 spec:
   replicas: {{ .Values.replicaCount }}
-  rollingUpdate:
-    maxSurge: {{ .Values.rollingUpdate.maxSurge }}
-    maxUnavailable: {{ .Values.rollingUpdate.maxUnavailable }}
+  strategy:
+    rollingUpdate:
+      maxSurge: {{ .Values.rollingUpdate.maxSurge }}
+      maxUnavailable: {{ .Values.rollingUpdate.maxUnavailable }}
   selector:
     matchLabels:
       app.kubernetes.io/name: {{ include "helm.name" . }}
@@ -45,9 +46,9 @@ spec:
             httpGet:
               path: /actuator/health
               port: 8080
-              initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
-              periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
-              successThreshold: {{ .Values.readinessProbe.successThreshold }}
+            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+            successThreshold: {{ .Values.readinessProbe.successThreshold }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}
diff --git a/custos-core-services/identity-core-service/src/main/resources/application.properties b/custos-core-services/identity-core-service/src/main/resources/application.properties
index 1893be2bc..02e3249c9 100644
--- a/custos-core-services/identity-core-service/src/main/resources/application.properties
+++ b/custos-core-services/identity-core-service/src/main/resources/application.properties
@@ -28,7 +28,7 @@ management.endpoints.web.exposure.include=*
 management.endpoint.metrics.enabled=true
 
 
-spring.datasource.url = jdbc:mysql://mysql-primary.custos.svc.cluster.local:3306/core_identity?useSSL=false&serverTimezone=UTC&useLegacyDatetimeCode=false
+spring.datasource.url = jdbc:mysql://mysql-primary.custos.svc.cluster.local:3306/core_identity?useSSL=false&serverTimezone=UTC&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true
 spring.datasource.username = root
 spring.datasource.password = root
 
@@ -38,4 +38,5 @@ spring.datasource.password = root
 spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5InnoDBDialect
 
 # Hibernate ddl auto (create, create-drop, validate, update)
-spring.jpa.hibernate.ddl-auto = update
\ No newline at end of file
+spring.jpa.hibernate.ddl-auto = update
+spring.profiles.active=@spring.profiles.active@
\ No newline at end of file
diff --git a/custos-core-services/identity-core-service/src/main/resources/bootstrap.properties b/custos-core-services/identity-core-service/src/main/resources/bootstrap.properties
index 760bf9291..b6f70dc30 100644
--- a/custos-core-services/identity-core-service/src/main/resources/bootstrap.properties
+++ b/custos-core-services/identity-core-service/src/main/resources/bootstrap.properties
@@ -18,4 +18,4 @@
 #
 
 spring.cloud.config.uri=http://custos-configuration-service.custos.svc.cluster.local:9000
-spring.profiles.active:default
\ No newline at end of file
+spring.profiles.active=@spring.profiles.active@
\ No newline at end of file
diff --git a/custos-core-services/pom.xml b/custos-core-services/pom.xml
index 382df5a85..0c89ec488 100644
--- a/custos-core-services/pom.xml
+++ b/custos-core-services/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>custos</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/custos-core-services/resource-secret-core-service/Dockerfile b/custos-core-services/resource-secret-core-service/Dockerfile
index 8007b966e..ea0f353e6 100644
--- a/custos-core-services/resource-secret-core-service/Dockerfile
+++ b/custos-core-services/resource-secret-core-service/Dockerfile
@@ -1,4 +1,5 @@
 FROM openjdk:11.0.5-jdk-slim
+COPY src/main/resources/vault-client-truststore.pkcs12 /home/ubuntu/vault-client-truststore.pkcs12
 VOLUME /tmp
 ARG JAR_FILE
 ADD ${JAR_FILE} app.jar
diff --git a/custos-core-services/resource-secret-core-service/pom.xml b/custos-core-services/resource-secret-core-service/pom.xml
index 2c5573ec9..dba9d962f 100644
--- a/custos-core-services/resource-secret-core-service/pom.xml
+++ b/custos-core-services/resource-secret-core-service/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>custos-core-services</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -103,6 +103,7 @@
             <artifactId>json</artifactId>
         </dependency>
 
+
     </dependencies>
 
 
@@ -122,6 +123,13 @@
                     <skip>false</skip>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <configuration>
+                    <skip>false</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/custos-core-services/resource-secret-core-service/src/main/helm/templates/deployment.yaml b/custos-core-services/resource-secret-core-service/src/main/helm/templates/deployment.yaml
index 31e54a6fc..74401f2c4 100644
--- a/custos-core-services/resource-secret-core-service/src/main/helm/templates/deployment.yaml
+++ b/custos-core-services/resource-secret-core-service/src/main/helm/templates/deployment.yaml
@@ -6,9 +6,10 @@ metadata:
 {{ include "helm.labels" . | indent 4 }}
 spec:
   replicas: {{ .Values.replicaCount }}
-  rollingUpdate:
-    maxSurge: {{ .Values.rollingUpdate.maxSurge }}
-    maxUnavailable: {{ .Values.rollingUpdate.maxUnavailable }}
+  strategy:
+    rollingUpdate:
+      maxSurge: {{ .Values.rollingUpdate.maxSurge }}
+      maxUnavailable: {{ .Values.rollingUpdate.maxUnavailable }}
   selector:
     matchLabels:
       app.kubernetes.io/name: {{ include "helm.name" . }}
@@ -45,9 +46,9 @@ spec:
             httpGet:
               path: /actuator/health
               port: 8080
-              initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
-              periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
-              successThreshold: {{ .Values.readinessProbe.successThreshold }}
+            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+            successThreshold: {{ .Values.readinessProbe.successThreshold }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}
diff --git a/custos-core-services/resource-secret-core-service/src/main/resources/application.properties b/custos-core-services/resource-secret-core-service/src/main/resources/application.properties
index 3168f2d5c..c0b9add22 100644
--- a/custos-core-services/resource-secret-core-service/src/main/resources/application.properties
+++ b/custos-core-services/resource-secret-core-service/src/main/resources/application.properties
@@ -27,7 +27,7 @@ management.security.enabled=false
 management.endpoints.web.exposure.include=*
 management.endpoint.metrics.enabled=true
 
-spring.datasource.url = jdbc:mysql://mysql-primary.custos.svc.cluster.local:3306/core_resource_secret?useSSL=false&serverTimezone=UTC&useLegacyDatetimeCode=false
+spring.datasource.url = jdbc:mysql://mysql-primary.custos.svc.cluster.local:3306/core_resource_secret?useSSL=false&serverTimezone=UTC&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true
 spring.datasource.username = root
 spring.datasource.password = root
 
@@ -38,4 +38,4 @@ spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5InnoDBDial
 
 # Hibernate ddl auto (create, create-drop, validate, update)
 spring.jpa.hibernate.ddl-auto = update
-
+spring.profiles.active=@spring.profiles.active@
diff --git a/custos-core-services/resource-secret-core-service/src/main/resources/bootstrap.properties b/custos-core-services/resource-secret-core-service/src/main/resources/bootstrap.properties
index 1c35e80c3..c23dcee4d 100644
--- a/custos-core-services/resource-secret-core-service/src/main/resources/bootstrap.properties
+++ b/custos-core-services/resource-secret-core-service/src/main/resources/bootstrap.properties
@@ -17,11 +17,12 @@
 #  under the License.
 #
 
-spring.cloud.vault.token={{token}}
-spring.cloud.vault.scheme=https
-spring.cloud.vault.host=vault.custos.scigap.org
-spring.cloud.vault.port=31190
-spring.cloud.vault.uri=https://vault.custos.scigap.org:31190
+
+spring.cloud.vault.token=${vault.token}
+spring.cloud.vault.scheme=${vault.scheme}
+spring.cloud.vault.host=${vault.host}
+spring.cloud.vault.port=${vault.port}
+spring.cloud.vault.uri=${vault.uri}
 spring.cloud.vault.authentication=token
-spring.cloud.vault.ssl.trust-store=vault-client-truststore.pkcs12
-spring.cloud.vault.ssl.trust-store-password=vaultpass
+spring.cloud.vault.ssl.trust-store=file:home/ubuntu/vault-client-truststore.pkcs12
+spring.cloud.vault.ssl.trust-store-password=vaultpass
\ No newline at end of file
diff --git a/custos-core-services/resource-secret-core-service/src/main/resources/vault-client-truststore.pkcs12 b/custos-core-services/resource-secret-core-service/src/main/resources/vault-client-truststore.pkcs12
index ec1e989cc..fb88917d1 100644
Binary files a/custos-core-services/resource-secret-core-service/src/main/resources/vault-client-truststore.pkcs12 and b/custos-core-services/resource-secret-core-service/src/main/resources/vault-client-truststore.pkcs12 differ
diff --git a/custos-core-services/sharing-core-service/pom.xml b/custos-core-services/sharing-core-service/pom.xml
index c78d457f9..72b82f90d 100644
--- a/custos-core-services/sharing-core-service/pom.xml
+++ b/custos-core-services/sharing-core-service/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>custos-core-services</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -95,6 +95,7 @@
             <artifactId>commons-io</artifactId>
         </dependency>
 
+
     </dependencies>
 
 
@@ -114,6 +115,13 @@
                     <skip>false</skip>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <configuration>
+                    <skip>false</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/custos-core-services/sharing-core-service/src/main/helm/templates/deployment.yaml b/custos-core-services/sharing-core-service/src/main/helm/templates/deployment.yaml
index 31e54a6fc..74401f2c4 100644
--- a/custos-core-services/sharing-core-service/src/main/helm/templates/deployment.yaml
+++ b/custos-core-services/sharing-core-service/src/main/helm/templates/deployment.yaml
@@ -6,9 +6,10 @@ metadata:
 {{ include "helm.labels" . | indent 4 }}
 spec:
   replicas: {{ .Values.replicaCount }}
-  rollingUpdate:
-    maxSurge: {{ .Values.rollingUpdate.maxSurge }}
-    maxUnavailable: {{ .Values.rollingUpdate.maxUnavailable }}
+  strategy:
+    rollingUpdate:
+      maxSurge: {{ .Values.rollingUpdate.maxSurge }}
+      maxUnavailable: {{ .Values.rollingUpdate.maxUnavailable }}
   selector:
     matchLabels:
       app.kubernetes.io/name: {{ include "helm.name" . }}
@@ -45,9 +46,9 @@ spec:
             httpGet:
               path: /actuator/health
               port: 8080
-              initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
-              periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
-              successThreshold: {{ .Values.readinessProbe.successThreshold }}
+            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+            successThreshold: {{ .Values.readinessProbe.successThreshold }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}
diff --git a/custos-core-services/sharing-core-service/src/main/resources/application.properties b/custos-core-services/sharing-core-service/src/main/resources/application.properties
index 01df48fed..dd0d4b4a1 100644
--- a/custos-core-services/sharing-core-service/src/main/resources/application.properties
+++ b/custos-core-services/sharing-core-service/src/main/resources/application.properties
@@ -27,7 +27,7 @@ management.security.enabled=false
 management.endpoints.web.exposure.include=*
 management.endpoint.metrics.enabled=true
 
-spring.datasource.url = jdbc:mysql://mysql-primary.custos.svc.cluster.local:3306/core_sharing?useSSL=false&serverTimezone=UTC&useLegacyDatetimeCode=false
+spring.datasource.url = jdbc:mysql://mysql-primary.custos.svc.cluster.local:3306/core_sharing?useSSL=false&serverTimezone=UTC&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true
 spring.datasource.username = root
 spring.datasource.password = root
 
@@ -38,4 +38,4 @@ spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5InnoDBDial
 
 # Hibernate ddl auto (create, create-drop, validate, update)
 spring.jpa.hibernate.ddl-auto = update
-
+spring.profiles.active=@spring.profiles.active@
diff --git a/custos-core-services/tenant-profile-core-service/pom.xml b/custos-core-services/tenant-profile-core-service/pom.xml
index 31efefc84..571bbc20a 100644
--- a/custos-core-services/tenant-profile-core-service/pom.xml
+++ b/custos-core-services/tenant-profile-core-service/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>custos-core-services</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -98,6 +98,7 @@
           <artifactId>persistence-api</artifactId>
       </dependency>
 
+
   </dependencies>
 
 
@@ -117,6 +118,13 @@
                     <skip>false</skip>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <configuration>
+                    <skip>false</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/custos-core-services/tenant-profile-core-service/src/main/helm/templates/deployment.yaml b/custos-core-services/tenant-profile-core-service/src/main/helm/templates/deployment.yaml
index 31e54a6fc..74401f2c4 100644
--- a/custos-core-services/tenant-profile-core-service/src/main/helm/templates/deployment.yaml
+++ b/custos-core-services/tenant-profile-core-service/src/main/helm/templates/deployment.yaml
@@ -6,9 +6,10 @@ metadata:
 {{ include "helm.labels" . | indent 4 }}
 spec:
   replicas: {{ .Values.replicaCount }}
-  rollingUpdate:
-    maxSurge: {{ .Values.rollingUpdate.maxSurge }}
-    maxUnavailable: {{ .Values.rollingUpdate.maxUnavailable }}
+  strategy:
+    rollingUpdate:
+      maxSurge: {{ .Values.rollingUpdate.maxSurge }}
+      maxUnavailable: {{ .Values.rollingUpdate.maxUnavailable }}
   selector:
     matchLabels:
       app.kubernetes.io/name: {{ include "helm.name" . }}
@@ -45,9 +46,9 @@ spec:
             httpGet:
               path: /actuator/health
               port: 8080
-              initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
-              periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
-              successThreshold: {{ .Values.readinessProbe.successThreshold }}
+            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+            successThreshold: {{ .Values.readinessProbe.successThreshold }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}
diff --git a/custos-core-services/tenant-profile-core-service/src/main/java/org/apache/custos/tenant/profile/persistance/respository/SearchTenantRepositoryImpl.java b/custos-core-services/tenant-profile-core-service/src/main/java/org/apache/custos/tenant/profile/persistance/respository/SearchTenantRepositoryImpl.java
index 4b488867e..735bf52ab 100644
--- a/custos-core-services/tenant-profile-core-service/src/main/java/org/apache/custos/tenant/profile/persistance/respository/SearchTenantRepositoryImpl.java
+++ b/custos-core-services/tenant-profile-core-service/src/main/java/org/apache/custos/tenant/profile/persistance/respository/SearchTenantRepositoryImpl.java
@@ -64,7 +64,7 @@ private String createSQLQuery(String requestEmail, String status, String type, l
 
         }
 
-        if (status != null && !status.isEmpty()) {
+        if (status != null  && !status.isEmpty()) {
             query = query + "E.status LIKE :" + "status" + " AND ";
             valueMap.put("status", status);
 
diff --git a/custos-core-services/tenant-profile-core-service/src/main/resources/application.properties b/custos-core-services/tenant-profile-core-service/src/main/resources/application.properties
index af49ec2fa..6ec01c786 100644
--- a/custos-core-services/tenant-profile-core-service/src/main/resources/application.properties
+++ b/custos-core-services/tenant-profile-core-service/src/main/resources/application.properties
@@ -27,7 +27,7 @@ management.security.enabled=false
 management.endpoints.web.exposure.include=*
 management.endpoint.metrics.enabled=true
 
-spring.datasource.url = jdbc:mysql://mysql-primary.custos.svc.cluster.local:3306/core_tenant?useSSL=false&serverTimezone=UTC&useLegacyDatetimeCode=false
+spring.datasource.url = jdbc:mysql://mysql-primary.custos.svc.cluster.local:3306/core_tenant?useSSL=false&serverTimezone=UTC&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true
 spring.datasource.username = root
 spring.datasource.password = root
 
@@ -38,4 +38,4 @@ spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5InnoDBDial
 
 # Hibernate ddl auto (create, create-drop, validate, update)
 spring.jpa.hibernate.ddl-auto = update
-
+spring.profiles.active=@spring.profiles.active@
diff --git a/custos-core-services/user-profile-core-service/pom.xml b/custos-core-services/user-profile-core-service/pom.xml
index 9aef3344b..2e9d4dcef 100644
--- a/custos-core-services/user-profile-core-service/pom.xml
+++ b/custos-core-services/user-profile-core-service/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>custos-core-services</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -96,6 +96,7 @@
             <artifactId>persistence-api</artifactId>
         </dependency>
 
+
     </dependencies>
 
 
@@ -115,6 +116,13 @@
                     <skip>false</skip>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <configuration>
+                    <skip>false</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/custos-core-services/user-profile-core-service/src/main/helm/templates/deployment.yaml b/custos-core-services/user-profile-core-service/src/main/helm/templates/deployment.yaml
index 31e54a6fc..74401f2c4 100644
--- a/custos-core-services/user-profile-core-service/src/main/helm/templates/deployment.yaml
+++ b/custos-core-services/user-profile-core-service/src/main/helm/templates/deployment.yaml
@@ -6,9 +6,10 @@ metadata:
 {{ include "helm.labels" . | indent 4 }}
 spec:
   replicas: {{ .Values.replicaCount }}
-  rollingUpdate:
-    maxSurge: {{ .Values.rollingUpdate.maxSurge }}
-    maxUnavailable: {{ .Values.rollingUpdate.maxUnavailable }}
+  strategy:
+    rollingUpdate:
+      maxSurge: {{ .Values.rollingUpdate.maxSurge }}
+      maxUnavailable: {{ .Values.rollingUpdate.maxUnavailable }}
   selector:
     matchLabels:
       app.kubernetes.io/name: {{ include "helm.name" . }}
@@ -45,9 +46,9 @@ spec:
             httpGet:
               path: /actuator/health
               port: 8080
-              initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
-              periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
-              successThreshold: {{ .Values.readinessProbe.successThreshold }}
+            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+            successThreshold: {{ .Values.readinessProbe.successThreshold }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}
diff --git a/custos-core-services/user-profile-core-service/src/main/resources/application.properties b/custos-core-services/user-profile-core-service/src/main/resources/application.properties
index 969557c58..df908b89b 100644
--- a/custos-core-services/user-profile-core-service/src/main/resources/application.properties
+++ b/custos-core-services/user-profile-core-service/src/main/resources/application.properties
@@ -27,7 +27,7 @@ management.security.enabled=false
 management.endpoints.web.exposure.include=*
 management.endpoint.metrics.enabled=true
 
-spring.datasource.url = jdbc:mysql://mysql-primary.custos.svc.cluster.local:3306/core_user_profile?useSSL=false&serverTimezone=UTC&useLegacyDatetimeCode=false
+spring.datasource.url = jdbc:mysql://mysql-primary.custos.svc.cluster.local:3306/core_user_profile?useSSL=false&serverTimezone=UTC&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true
 spring.datasource.username = root
 spring.datasource.password = root
 
@@ -37,4 +37,5 @@ spring.datasource.password = root
 spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5InnoDBDialect
 spring.jpa.properties.hibernate.enable_lazy_load_no_trans=true
 # Hibernate ddl auto (create, create-drop, validate, update)
-spring.jpa.hibernate.ddl-auto = update
\ No newline at end of file
+spring.jpa.hibernate.ddl-auto = update
+spring.profiles.active=@spring.profiles.active@
\ No newline at end of file
diff --git a/custos-core-services/utility-services/custos-configuration-service/pom.xml b/custos-core-services/utility-services/custos-configuration-service/pom.xml
index 6b0446dbc..17b3adfec 100644
--- a/custos-core-services/utility-services/custos-configuration-service/pom.xml
+++ b/custos-core-services/utility-services/custos-configuration-service/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>custos-core-services</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -42,6 +42,7 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-config-server</artifactId>
         </dependency>
+
     </dependencies>
     <build>
         <plugins>
@@ -59,6 +60,29 @@
                     <skip>false</skip>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <configuration>
+                    <target>
+                        <!-- keyfile+passphrase or  password, choose one -->
+                        <!--
+                        <scp localFile="${project.basedir}/target/qos-spark-1.0.jar"
+                          remoteToFile="root@192.168.203.156:/usr/sanss" verbose="true"
+                          keyfile="C:\Users\shengw\.ssh\192.168.203.156\id_rsa"
+                          passphrase="">
+                        </scp>
+                         -->
+                        <scp localFile="${project.basedir}/target/helm/${project.artifactId}-${project.version}.tgz"
+                             remoteToFile="ubuntu@${host}:/home/ubuntu/custos/artifacts"
+                             verbose="true"
+                             keyfile="/Users/isururanawaka/.ssh/custos/id_rsa"
+                             passphrase="isjarana" trust="true">
+                        </scp>
+                    </target>
+                    <skip>false</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/custos-core-services/utility-services/custos-configuration-service/src/main/helm/templates/deployment.yaml b/custos-core-services/utility-services/custos-configuration-service/src/main/helm/templates/deployment.yaml
index a040bc03f..b5440d0ea 100644
--- a/custos-core-services/utility-services/custos-configuration-service/src/main/helm/templates/deployment.yaml
+++ b/custos-core-services/utility-services/custos-configuration-service/src/main/helm/templates/deployment.yaml
@@ -6,9 +6,10 @@ metadata:
 {{ include "helm.labels" . | indent 4 }}
 spec:
   replicas: {{ .Values.replicaCount }}
-  rollingUpdate:
-    maxSurge: {{ .Values.rollingUpdate.maxSurge }}
-    maxUnavailable: {{ .Values.rollingUpdate.maxUnavailable }}
+  strategy:
+    rollingUpdate:
+      maxSurge: {{ .Values.rollingUpdate.maxSurge }}
+      maxUnavailable: {{ .Values.rollingUpdate.maxUnavailable }}
   selector:
     matchLabels:
       app.kubernetes.io/name: {{ include "helm.name" . }}
@@ -42,9 +43,9 @@ spec:
             httpGet:
               path: /actuator/health
               port: 9000
-              initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
-              periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
-              successThreshold: {{ .Values.readinessProbe.successThreshold }}
+            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+            successThreshold: {{ .Values.readinessProbe.successThreshold }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}
diff --git a/custos-core-services/utility-services/custos-configuration-service/src/main/resources/agentManagementService-dev.properties b/custos-core-services/utility-services/custos-configuration-service/src/main/resources/agentManagementService-dev.properties
new file mode 100644
index 000000000..bf8d6682d
--- /dev/null
+++ b/custos-core-services/utility-services/custos-configuration-service/src/main/resources/agentManagementService-dev.properties
@@ -0,0 +1,42 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied. See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#
+
+identity.service.dns.name=identity-core-service.custos.svc.cluster.local
+identity.service.port=7000
+tenant.profile.core.service.dns.name=tenant-profile-core-service.custos.svc.cluster.local
+tenant.profile.core.service.port=7000
+credential.store.service.dns.name=credential-store-core-service.custos.svc.cluster.local
+credential.store.service.port=7000
+agent.profile.core.service.dns.name=agent-profile-core-service.custos.svc.cluster.local
+agent.profile.core.service.port=7000
+iam.admin.service.dns.name=iam-admin-core-service.custos.svc.cluster.local
+iam.admin.service.port=7000
+iam.server.url=https://keycloak.custos.scigap.org:31000/auth/
+federated.authentication.service.dns.name=federeted-authentication-core-service.custos.svc.cluster.local
+federated.authentication.service.port=7000
+custos.logging.core.service.dns.name=custos-logging.custos.svc.cluster.local
+custos.logging.core.service.port=7000
+cluster.management.core.service.dns.name=cluster-management-core-service.custos.svc.cluster.local
+cluster.management.core.service.port=7000
+resource.secret.service.dns.name=resource-secret-core-service.custos.svc.cluster.local
+resource.secret.service.port=7000
+user.profile.core.service.dns.name=user-profile-core-service.custos.svc.cluster.local
+user.profile.core.service.port=7000
+messaging.core.service.dns.name=custos-messaging-core-service.custos.svc.cluster.local
+messaging.core.service.port=7000
\ No newline at end of file
diff --git a/custos-core-services/utility-services/custos-configuration-service/src/main/resources/agentManagementService.properties b/custos-core-services/utility-services/custos-configuration-service/src/main/resources/agentManagementService-staging.properties
similarity index 90%
rename from custos-core-services/utility-services/custos-configuration-service/src/main/resources/agentManagementService.properties
rename to custos-core-services/utility-services/custos-configuration-service/src/main/resources/agentManagementService-staging.properties
index 427af3de4..b49f9d61b 100644
--- a/custos-core-services/utility-services/custos-configuration-service/src/main/resources/agentManagementService.properties
+++ b/custos-core-services/utility-services/custos-configuration-service/src/main/resources/agentManagementService-staging.properties
@@ -27,7 +27,7 @@ agent.profile.core.service.dns.name=agent-profile-core-service.custos.svc.cluste
 agent.profile.core.service.port=7000
 iam.admin.service.dns.name=iam-admin-core-service.custos.svc.cluster.local
 iam.admin.service.port=7000
-iam.server.url=https://keycloak.custos.scigap.org:31000/auth/
+iam.server.url=https://service.staging.usecustos.org:30170/auth/
 federated.authentication.service.dns.name=federeted-authentication-core-service.custos.svc.cluster.local
 federated.authentication.service.port=7000
 custos.logging.core.service.dns.name=custos-logging.custos.svc.cluster.local
@@ -37,6 +37,4 @@ cluster.management.core.service.port=7000
 resource.secret.service.dns.name=resource-secret-core-service.custos.svc.cluster.local
 resource.secret.service.port=7000
 user.profile.core.service.dns.name=user-profile-core-service.custos.svc.cluster.local
-user.profile.core.service.port=7000
-messaging.core.service.dns.name=custos-messaging-core-service.custos.svc.cluster.local
-messaging.core.service.port=7000
\ No newline at end of file
+user.profile.core.service.port=7000
\ No newline at end of file
diff --git a/custos-core-services/utility-services/custos-configuration-service/src/main/resources/clusterManagementCoreService-dev.properties b/custos-core-services/utility-services/custos-configuration-service/src/main/resources/clusterManagementCoreService-dev.properties
new file mode 100644
index 000000000..055c8fe53
--- /dev/null
+++ b/custos-core-services/utility-services/custos-configuration-service/src/main/resources/clusterManagementCoreService-dev.properties
@@ -0,0 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied. See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#
+custos.server.secret.name=tls-secret
+custos.server.kube.namespace=custos
diff --git a/custos-core-services/utility-services/custos-configuration-service/src/main/resources/clusterManagementCoreService.properties b/custos-core-services/utility-services/custos-configuration-service/src/main/resources/clusterManagementCoreService-staging.properties
similarity index 100%
rename from custos-core-services/utility-services/custos-configuration-service/src/main/resources/clusterManagementCoreService.properties
rename to custos-core-services/utility-services/custos-configuration-service/src/main/resources/clusterManagementCoreService-staging.properties
diff --git a/custos-core-services/utility-services/custos-configuration-service/src/main/resources/federatedAuthenticationCoreService-dev.properties b/custos-core-services/utility-services/custos-configuration-service/src/main/resources/federatedAuthenticationCoreService-dev.properties
new file mode 100644
index 000000000..af7d4c2be
--- /dev/null
+++ b/custos-core-services/utility-services/custos-configuration-service/src/main/resources/federatedAuthenticationCoreService-dev.properties
@@ -0,0 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied. See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#
+
+ciLogon.admin.client.id=${cilogon.dev.id}
+ciLogon.admin.client.secret=${cilogon.dev.sec}
+ciLogon.admin.auth.endpoint=https://test.cilogon.org/oauth2/oidc-cm
diff --git a/custos-core-services/utility-services/custos-configuration-service/src/main/resources/federatedAuthenticationCoreService-staging.properties b/custos-core-services/utility-services/custos-configuration-service/src/main/resources/federatedAuthenticationCoreService-staging.properties
new file mode 100644
index 000000000..7649b0d0a
--- /dev/null
+++ b/custos-core-services/utility-services/custos-configuration-service/src/main/resources/federatedAuthenticationCoreService-staging.properties
@@ -0,0 +1,3 @@
+ciLogon.admin.client.id=${cilogon.staging.id}
+ciLogon.admin.client.secret=${cilogon.staging.sec}
+ciLogon.admin.auth.endpoint=https://test.cilogon.org/oauth2/oidc-cm
\ No newline at end of file
diff --git a/custos-core-services/utility-services/custos-configuration-service/src/main/resources/federatedAuthenticationCoreService.properties b/custos-core-services/utility-services/custos-configuration-service/src/main/resources/federatedAuthenticationCoreService.properties
deleted file mode 100644
index 9b7eaca1f..000000000
--- a/custos-core-services/utility-services/custos-configuration-service/src/main/resources/federatedAuthenticationCoreService.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-ciLogon.admin.client.id={{token}}
-ciLogon.admin.client.secret={{token}}
-ciLogon.admin.auth.endpoint=https://test.cilogon.org/oauth2/oidc-cm
\ No newline at end of file
diff --git a/custos-core-services/utility-services/custos-configuration-service/src/main/resources/groupManagementService-dev.properties b/custos-core-services/utility-services/custos-configuration-service/src/main/resources/groupManagementService-dev.properties
new file mode 100644
index 000000000..be9cca7d8
--- /dev/null
+++ b/custos-core-services/utility-services/custos-configuration-service/src/main/resources/groupManagementService-dev.properties
@@ -0,0 +1,38 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied. See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#
+
+identity.service.dns.name=identity-core-service.custos.svc.cluster.local
+identity.service.port=7000
+tenant.profile.core.service.dns.name=tenant-profile-core-service.custos.svc.cluster.local
+tenant.profile.core.service.port=7000
+credential.store.service.dns.name=credential-store-core-service.custos.svc.cluster.local
+credential.store.service.port=7000
+user.profile.core.service.dns.name=user-profile-core-service.custos.svc.cluster.local
+user.profile.core.service.port=7000
+iam.admin.service.dns.name=iam-admin-core-service.custos.svc.cluster.local
+iam.admin.service.port=7000
+iam.server.url=https://keycloak.custos.scigap.org:31000/auth/
+custos.logging.core.service.dns.name=custos-logging.custos.svc.cluster.local
+custos.logging.core.service.port=7000
+cluster.management.core.service.dns.name=cluster-management-core-service.custos.svc.cluster.local
+cluster.management.core.service.port=7000
+resource.secret.service.dns.name=resource-secret-core-service.custos.svc.cluster.local
+resource.secret.service.port=7000
+messaging.core.service.dns.name=custos-messaging-core-service.custos.svc.cluster.local
+messaging.core.service.port=7000
diff --git a/custos-core-services/utility-services/custos-configuration-service/src/main/resources/groupManagementService.properties b/custos-core-services/utility-services/custos-configuration-service/src/main/resources/groupManagementService-staging.properties
similarity index 96%
rename from custos-core-services/utility-services/custos-configuration-service/src/main/resources/groupManagementService.properties
rename to custos-core-services/utility-services/custos-configuration-service/src/main/resources/groupManagementService-staging.properties
index fe5c94c39..f5ac6c2ed 100644
--- a/custos-core-services/utility-services/custos-configuration-service/src/main/resources/groupManagementService.properties
+++ b/custos-core-services/utility-services/custos-configuration-service/src/main/resources/groupManagementService-staging.properties
@@ -27,7 +27,7 @@ user.profile.core.service.dns.name=user-profile-core-service.custos.svc.cluster.
 user.profile.core.service.port=7000
 iam.admin.service.dns.name=iam-admin-core-service.custos.svc.cluster.local
 iam.admin.service.port=7000
-iam.server.url=https://keycloak.custos.scigap.org:31000/auth/
+iam.server.url=https://service.staging.usecustos.org:30170/auth/
 custos.logging.core.service.dns.name=custos-logging.custos.svc.cluster.local
 custos.logging.core.service.port=7000
 cluster.management.core.service.dns.name=cluster-management-core-service.custos.svc.cluster.local
diff --git a/custos-core-services/utility-services/custos-configuration-service/src/main/resources/iamAdminCoreService.properties b/custos-core-services/utility-services/custos-configuration-service/src/main/resources/iamAdminCoreService-dev.properties
similarity index 54%
rename from custos-core-services/utility-services/custos-configuration-service/src/main/resources/iamAdminCoreService.properties
rename to custos-core-services/utility-services/custos-configuration-service/src/main/resources/iamAdminCoreService-dev.properties
index 8a4224559..589bdc1c5 100644
--- a/custos-core-services/utility-services/custos-configuration-service/src/main/resources/iamAdminCoreService.properties
+++ b/custos-core-services/utility-services/custos-configuration-service/src/main/resources/iamAdminCoreService-dev.properties
@@ -1,9 +1,28 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied. See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#
+
 iam.server.client.id=admin-cli
 iam.server.truststore.path=/home/ubuntu/keystore/keycloak-client-truststore.pkcs12
 iam.server.truststore.password=keycloak
 iam.server.url=https://keycloak.custos.scigap.org:31000/auth/
-iam.server.admin.username={{token}}
-iam.server.admin.password={{token}}
+iam.server.admin.username=${iam.dev.username}
+iam.server.admin.password=${iam.dev.password}
 iam.server.super.admin.realm.id=master
 iam.federated.cilogon.authorization.endpoint=https://cilogon.org/authorize
 iam.federated.cilogon.token.endpoint=https://cilogon.org/oauth2/token
@@ -18,6 +37,8 @@ end.session.endpoint=https://custos.scigap.org/apiserver/identity-management/v1.
 user.info.endpoint=https://custos.scigap.org/apiserver/user-management/v1.0.0/userinfo
 jwks_uri=https://custos.scigap.org/apiserver/identity-management/v1.0.0/certs
 registration.endpoint=https://custos.scigap.org/apiserver/tenant-management/v1.0.0/oauth2/tenant
-ciLogon.admin.client.id={{token}}
-ciLogon.admin.client.secret={{token}}
-ciLogon.admin.auth.endpoint=https://test.cilogon.org/oauth2/oidc-cm
\ No newline at end of file
+ciLogon.admin.client.id=${cilogon.dev.id}
+ciLogon.admin.client.secret=${cilogon.dev.sec}
+ciLogon.admin.auth.endpoint=https://test.cilogon.org/oauth2/oidc-cm
+cluster.management.core.service.dns.name=cluster-management-core-service.keycloak.svc.cluster.local
+cluster.management.core.service.port=7000
\ No newline at end of file
diff --git a/custos-core-services/utility-services/custos-configuration-service/src/main/resources/iamAdminCoreService-staging.properties b/custos-core-services/utility-services/custos-configuration-service/src/main/resources/iamAdminCoreService-staging.properties
new file mode 100644
index 000000000..c6d22a4ed
--- /dev/null
+++ b/custos-core-services/utility-services/custos-configuration-service/src/main/resources/iamAdminCoreService-staging.properties
@@ -0,0 +1,25 @@
+iam.server.client.id=admin-cli
+iam.server.truststore.path=/home/ubuntu/keystore/keycloak-client-truststore.pkcs12
+iam.server.truststore.password=keycloak
+iam.server.url=https://service.staging.usecustos.org:30170/auth/
+iam.server.admin.username=${iam.staging.username}
+iam.server.admin.password=${iam.staging.password}
+iam.server.super.admin.realm.id=master
+iam.federated.cilogon.authorization.endpoint=https://cilogon.org/authorize
+iam.federated.cilogon.token.endpoint=https://cilogon.org/oauth2/token
+iam.federated.cilogon.token.userinfo.endpoint=https://cilogon.org/oauth2/userinfo
+iam.federated.cilogon.issuer=https://cilogon.org
+iam.federated.cilogon.jwksUri=https://cilogon.org/oauth2/certs
+introspection.endpoint=https://service.staging.usecustos.org/identity-management/v1.0.0/token/introspect
+issuer=https://service.staging.usecustos.org/
+authorization.endpoint=https://service.staging.usecustos.org/apiserver/identity-management/v1.0.0/authorize
+token.endpoint=https://service.staging.usecustos.org/apiserver/identity-management/v1.0.0/token
+end.session.endpoint=https://service.staging.usecustos.org/apiserver/identity-management/v1.0.0/logout
+user.info.endpoint=https://service.staging.usecustos.org/apiserver/user-management/v1.0.0/userinfo
+jwks_uri=https://service.staging.usecustos.org/apiserver/identity-management/v1.0.0/certs
+registration.endpoint=https://service.staging.usecustos.org/apiserver/tenant-management/v1.0.0/oauth2/tenant
+ciLogon.admin.client.id=${cilogon.staging.id}
+ciLogon.admin.client.secret=${cilogon.staging.sec}
+ciLogon.admin.auth.endpoint=https://test.cilogon.org/oauth2/oidc-cm
+cluster.management.core.service.dns.name=cluster-management-core-service.keycloak.svc.cluster.local
+cluster.management.core.service.port=7000
\ No newline at end of file
diff --git a/custos-core-services/utility-services/custos-configuration-service/src/main/resources/identityCoreService.properties b/custos-core-services/utility-services/custos-configuration-service/src/main/resources/identityCoreService-dev.properties
similarity index 75%
rename from custos-core-services/utility-services/custos-configuration-service/src/main/resources/identityCoreService.properties
rename to custos-core-services/utility-services/custos-configuration-service/src/main/resources/identityCoreService-dev.properties
index 809b54c00..a0ce104a0 100644
--- a/custos-core-services/utility-services/custos-configuration-service/src/main/resources/identityCoreService.properties
+++ b/custos-core-services/utility-services/custos-configuration-service/src/main/resources/identityCoreService-dev.properties
@@ -7,12 +7,12 @@
 # "License"); you may not use this file except in compliance
 # with the License. You may obtain a copy of the License at
 #
-# http://www.apache.org/licenses/LICENSE-2.0
+#  http://www.apache.org/licenses/LICENSE-2.0
 #
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied. See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
 #
@@ -31,14 +31,16 @@ user.info.endpoint=https://custos.scigap.org/apiserver/user-management/v1.0.0/us
 jwks_uri=https://custos.scigap.org/apiserver/identity-management/v1.0.0/certs
 registration.endpoint=https://custos.scigap.org:/apiserver/tenant-management/v1.0.0/oauth2/tenant
 iam.server.client.id=admin-cli
-iam.server.admin.username={{token}}
-iam.server.admin.password={{token}}
+iam.server.admin.username=${iam.dev.username}
+iam.server.admin.password=${iam.dev.password}
 iam.server.super.admin.realm.id=master
 iam.federated.cilogon.authorization.endpoint=https://cilogon.org/authorize
 iam.federated.cilogon.token.endpoint=https://cilogon.org/oauth2/token
 iam.federated.cilogon.token.userinfo.endpoint=https://cilogon.org/oauth2/userinfo
 iam.federated.cilogon.issuer=https://cilogon.org
 iam.federated.cilogon.jwksUri=https://cilogon.org/oauth2/certs
-ciLogon.admin.client.id={{token}}
-ciLogon.admin.client.secret={{token}}
+ciLogon.admin.client.id=${cilogon.dev.id}
+ciLogon.admin.client.secret=${cilogon.dev.sec}
 ciLogon.admin.auth.endpoint=https://test.cilogon.org/oauth2/oidc-cm
+cluster.management.core.service.dns.name=cluster-management-core-service.keycloak.svc.cluster.local
+cluster.management.core.service.port=7000
diff --git a/custos-core-services/utility-services/custos-configuration-service/src/main/resources/identityCoreService-staging.properties b/custos-core-services/utility-services/custos-configuration-service/src/main/resources/identityCoreService-staging.properties
new file mode 100644
index 000000000..a3dc94a59
--- /dev/null
+++ b/custos-core-services/utility-services/custos-configuration-service/src/main/resources/identityCoreService-staging.properties
@@ -0,0 +1,46 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#
+
+custos.identity.auth.cache.enabled=true
+custos.identity.auth.cache.size=1024
+iam.server.url=https://service.staging.usecustos.org:30170/auth/
+iam.server.truststore.path=/home/ubuntu/keystore/keycloak-client-truststore.pkcs12
+iam.server.truststore.password=keycloak
+introspection.endpoint=https://service.staging.usecustos.org/apiserver/identity-management/v1.0.0/token/introspect
+issuer=https://custos.scigap.org/
+authorization.endpoint=https://service.staging.usecustos.org/apiserver/identity-management/v1.0.0/authorize
+token.endpoint=https://service.staging.usecustos.org/apiserver/identity-management/v1.0.0/token
+end.session.endpoint=https://service.staging.usecustos.org/apiserver/identity-management/v1.0.0/logout
+user.info.endpoint=https://service.staging.usecustos.org/apiserver/user-management/v1.0.0/userinfo
+jwks_uri=https://service.staging.usecustos.org/apiserver/identity-management/v1.0.0/certs
+registration.endpoint=https://service.staging.usecustos.org/apiserver/tenant-management/v1.0.0/oauth2/tenant
+iam.server.client.id=admin-cli
+iam.server.admin.username=${iam.staging.username}
+iam.server.admin.password=${iam.staging.password}
+iam.server.super.admin.realm.id=master
+iam.federated.cilogon.authorization.endpoint=https://cilogon.org/authorize
+iam.federated.cilogon.token.endpoint=https://cilogon.org/oauth2/token
+iam.federated.cilogon.token.userinfo.endpoint=https://cilogon.org/oauth2/userinfo
+iam.federated.cilogon.issuer=https://cilogon.org
+iam.federated.cilogon.jwksUri=https://cilogon.org/oauth2/certs
+ciLogon.admin.client.id=${cilogon.staging.id}
+ciLogon.admin.client.secret=${cilogon.staging.sec}
+ciLogon.admin.auth.endpoint=https://test.cilogon.org/oauth2/oidc-cm
+cluster.management.core.service.dns.name=cluster-management-core-service.keycloak.svc.cluster.local
+cluster.management.core.service.port=7000
diff --git a/custos-core-services/utility-services/custos-configuration-service/src/main/resources/identityManagementService-dev.properties b/custos-core-services/utility-services/custos-configuration-service/src/main/resources/identityManagementService-dev.properties
new file mode 100644
index 000000000..e3c033365
--- /dev/null
+++ b/custos-core-services/utility-services/custos-configuration-service/src/main/resources/identityManagementService-dev.properties
@@ -0,0 +1,38 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied. See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#
+
+identity.service.dns.name=identity-core-service.custos.svc.cluster.local
+identity.service.port=7000
+tenant.profile.core.service.dns.name=tenant-profile-core-service.custos.svc.cluster.local
+tenant.profile.core.service.port=7000
+credential.store.service.dns.name=credential-store-core-service.custos.svc.cluster.local
+credential.store.service.port=7000
+iam.server.url=https://keycloak.custos.scigap.org:31000/auth/
+user.profile.core.service.dns.name=user-profile-core-service.custos.svc.cluster.local
+user.profile.core.service.port=7000
+iam.admin.service.dns.name=iam-admin-core-service.custos.svc.cluster.local
+iam.admin.service.port=7000
+custos.logging.core.service.dns.name=custos-logging.custos.svc.cluster.local
+custos.logging.core.service.port=7000
+cluster.management.core.service.dns.name=cluster-management-core-service.custos.svc.cluster.local
+cluster.management.core.service.port=7000
+resource.secret.service.dns.name=resource-secret-core-service.custos.svc.cluster.local
+resource.secret.service.port=7000
+messaging.core.service.dns.name=custos-messaging-core-service.custos.svc.cluster.local
+messaging.core.service.port=7000
\ No newline at end of file
diff --git a/custos-core-services/utility-services/custos-configuration-service/src/main/resources/userManagementService.properties b/custos-core-services/utility-services/custos-configuration-service/src/main/resources/identityManagementService-staging.properties
similarity index 96%
rename from custos-core-services/utility-services/custos-configuration-service/src/main/resources/userManagementService.properties
rename to custos-core-services/utility-services/custos-configuration-service/src/main/resources/identityManagementService-staging.properties
index 5429b0eb5..ad9bc71f4 100644
--- a/custos-core-services/utility-services/custos-configuration-service/src/main/resources/userManagementService.properties
+++ b/custos-core-services/utility-services/custos-configuration-service/src/main/resources/identityManagementService-staging.properties
@@ -23,11 +23,11 @@ tenant.profile.core.service.dns.name=tenant-profile-core-service.custos.svc.clus
 tenant.profile.core.service.port=7000
 credential.store.service.dns.name=credential-store-core-service.custos.svc.cluster.local
 credential.store.service.port=7000
+iam.server.url=https://service.staging.usecustos.org:30170/auth/
 user.profile.core.service.dns.name=user-profile-core-service.custos.svc.cluster.local
 user.profile.core.service.port=7000
 iam.admin.service.dns.name=iam-admin-core-service.custos.svc.cluster.local
 iam.admin.service.port=7000
-iam.server.url=https://keycloak.custos.scigap.org:31000/auth/
 custos.logging.core.service.dns.name=custos-logging.custos.svc.cluster.local
 custos.logging.core.service.port=7000
 cluster.management.core.service.dns.name=cluster-management-core-service.custos.svc.cluster.local
diff --git a/custos-core-services/utility-services/custos-configuration-service/src/main/resources/logManagementService.properties b/custos-core-services/utility-services/custos-configuration-service/src/main/resources/logManagementService-dev.properties
similarity index 100%
rename from custos-core-services/utility-services/custos-configuration-service/src/main/resources/logManagementService.properties
rename to custos-core-services/utility-services/custos-configuration-service/src/main/resources/logManagementService-dev.properties
diff --git a/custos-core-services/utility-services/custos-configuration-service/src/main/resources/logManagementService-staging.properties b/custos-core-services/utility-services/custos-configuration-service/src/main/resources/logManagementService-staging.properties
new file mode 100644
index 000000000..7f601c466
--- /dev/null
+++ b/custos-core-services/utility-services/custos-configuration-service/src/main/resources/logManagementService-staging.properties
@@ -0,0 +1,40 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied. See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#
+
+tenant.profile.core.service.dns.name=tenant-profile-core-service.custos.svc.cluster.local
+tenant.profile.core.service.port=7000
+iam.admin.service.dns.name=iam-admin-core-service.custos.svc.cluster.local
+iam.admin.service.port=7000
+credential.store.service.dns.name=credential-store-core-service.custos.svc.cluster.local
+credential.store.service.port=7000
+federated.authentication.service.dns.name=federeted-authentication-core-service.custos.svc.cluster.local
+federated.authentication.service.port=7000
+identity.service.dns.name=identity-core-service.custos.svc.cluster.local
+identity.service.port=7000
+user.profile.core.service.dns.name=user-profile-core-service.custos.svc.cluster.local
+user.profile.core.service.port=7000
+iam.server.url=https://service.staging.usecustos.org:30170/auth/
+custos.logging.core.service.dns.name=custos-logging.custos.svc.cluster.local
+custos.logging.core.service.port=7000
+cluster.management.core.service.dns.name=cluster-management-core-service.custos.svc.cluster.local
+cluster.management.core.service.port=7000
+resource.secret.service.dns.name=resource-secret-core-service.custos.svc.cluster.local
+resource.secret.service.port=7000
+messaging.core.service.dns.name=custos-messaging-core-service.custos.svc.cluster.local
+messaging.core.service.port=7000
\ No newline at end of file
diff --git a/custos-core-services/utility-services/custos-configuration-service/src/main/resources/messagingCoreService-dev.properties b/custos-core-services/utility-services/custos-configuration-service/src/main/resources/messagingCoreService-dev.properties
new file mode 100644
index 000000000..ddd9d1b22
--- /dev/null
+++ b/custos-core-services/utility-services/custos-configuration-service/src/main/resources/messagingCoreService-dev.properties
@@ -0,0 +1,30 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied. See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#
+
+core.messaging.service.broker.url=149.165.170.70:9092
+core.messaging.service.publisher.id=custosEventPublisher
+mail.smtp.auth=true
+mail.smtp.starttls.enable=true
+mail.smtp.host=smtp.gmail.com
+mail.smtp.port=587
+mail.smtp.ssl.trust=smtp.gmail.com
+mail.sender.username=custosemailagent@gmail.com
+mail.sender.password={{custos.email.password}}
+user.profile.core.service.dns.name=user-profile-core-service.custos.svc.cluster.local
+user.profile.core.service.port=7000
diff --git a/custos-core-services/utility-services/custos-configuration-service/src/main/resources/messagingCoreService.properties b/custos-core-services/utility-services/custos-configuration-service/src/main/resources/messagingCoreService-staging.properties
similarity index 96%
rename from custos-core-services/utility-services/custos-configuration-service/src/main/resources/messagingCoreService.properties
rename to custos-core-services/utility-services/custos-configuration-service/src/main/resources/messagingCoreService-staging.properties
index 6ad822ed8..e20c32b46 100644
--- a/custos-core-services/utility-services/custos-configuration-service/src/main/resources/messagingCoreService.properties
+++ b/custos-core-services/utility-services/custos-configuration-service/src/main/resources/messagingCoreService-staging.properties
@@ -25,6 +25,6 @@ mail.smtp.host=smtp.gmail.com
 mail.smtp.port=587
 mail.smtp.ssl.trust=smtp.gmail.com
 mail.sender.username=custosemailagent@gmail.com
-mail.sender.password={{token}}
+mail.sender.password={{custos.email.password}}
 user.profile.core.service.dns.name=user-profile-core-service.custos.svc.cluster.local
 user.profile.core.service.port=7000
diff --git a/custos-core-services/utility-services/custos-configuration-service/src/main/resources/resourceSecretManagementService-dev.properties b/custos-core-services/utility-services/custos-configuration-service/src/main/resources/resourceSecretManagementService-dev.properties
new file mode 100644
index 000000000..8cb95c5eb
--- /dev/null
+++ b/custos-core-services/utility-services/custos-configuration-service/src/main/resources/resourceSecretManagementService-dev.properties
@@ -0,0 +1,40 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied. See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#
+
+tenant.profile.core.service.dns.name=tenant-profile-core-service.custos.svc.cluster.local
+tenant.profile.core.service.port=7000
+iam.admin.service.dns.name=iam-admin-core-service.custos.svc.cluster.local
+iam.admin.service.port=7000
+credential.store.service.dns.name=credential-store-core-service.custos.svc.cluster.local
+credential.store.service.port=7000
+federated.authentication.service.dns.name=federeted-authentication-core-service.custos.svc.cluster.local
+federated.authentication.service.port=7000
+identity.service.dns.name=identity-core-service.custos.svc.cluster.local
+identity.service.port=7000
+user.profile.core.service.dns.name=user-profile-core-service.custos.svc.cluster.local
+user.profile.core.service.port=7000
+iam.server.url=https://keycloak.custos.scigap.org:31000/auth/
+cluster.management.core.service.dns.name=cluster-management-core-service.custos.svc.cluster.local
+cluster.management.core.service.port=7000
+resource.secret.service.dns.name=resource-secret-core-service.custos.svc.cluster.local
+resource.secret.service.port=7000
+custos.logging.core.service.dns.name=custos-logging.custos.svc.cluster.local
+custos.logging.core.service.port=7000
+messaging.core.service.dns.name=custos-messaging-core-service.custos.svc.cluster.local
+messaging.core.service.port=7000
diff --git a/custos-core-services/utility-services/custos-configuration-service/src/main/resources/resourceSecretManagementService.properties b/custos-core-services/utility-services/custos-configuration-service/src/main/resources/resourceSecretManagementService-staging.properties
similarity index 96%
rename from custos-core-services/utility-services/custos-configuration-service/src/main/resources/resourceSecretManagementService.properties
rename to custos-core-services/utility-services/custos-configuration-service/src/main/resources/resourceSecretManagementService-staging.properties
index 68a3f2329..7ef9103d9 100644
--- a/custos-core-services/utility-services/custos-configuration-service/src/main/resources/resourceSecretManagementService.properties
+++ b/custos-core-services/utility-services/custos-configuration-service/src/main/resources/resourceSecretManagementService-staging.properties
@@ -29,7 +29,7 @@ identity.service.dns.name=identity-core-service.custos.svc.cluster.local
 identity.service.port=7000
 user.profile.core.service.dns.name=user-profile-core-service.custos.svc.cluster.local
 user.profile.core.service.port=7000
-iam.server.url=https://keycloak.custos.scigap.org:31000/auth/
+iam.server.url=https://service.staging.usecustos.org:30170/auth/
 cluster.management.core.service.dns.name=cluster-management-core-service.custos.svc.cluster.local
 cluster.management.core.service.port=7000
 resource.secret.service.dns.name=resource-secret-core-service.custos.svc.cluster.local
diff --git a/custos-core-services/utility-services/custos-configuration-service/src/main/resources/scimService.properties b/custos-core-services/utility-services/custos-configuration-service/src/main/resources/scimService-dev.properties
similarity index 71%
rename from custos-core-services/utility-services/custos-configuration-service/src/main/resources/scimService.properties
rename to custos-core-services/utility-services/custos-configuration-service/src/main/resources/scimService-dev.properties
index 63fb825b8..08d35882d 100644
--- a/custos-core-services/utility-services/custos-configuration-service/src/main/resources/scimService.properties
+++ b/custos-core-services/utility-services/custos-configuration-service/src/main/resources/scimService-dev.properties
@@ -7,12 +7,12 @@
 # "License"); you may not use this file except in compliance
 # with the License. You may obtain a copy of the License at
 #
-# http://www.apache.org/licenses/LICENSE-2.0
+#  http://www.apache.org/licenses/LICENSE-2.0
 #
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied. See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
 #
@@ -31,4 +31,8 @@ user.profile.core.service.dns.name=user-profile-core-service.custos.svc.cluster.
 user.profile.core.service.port=7000
 iam.server.url=https://keycloak.custos.scigap.org:31000/auth/
 tenant.profile.core.service.dns.name=tenant-profile-core-service.custos.svc.cluster.local
-tenant.profile.core.service.port=7000
\ No newline at end of file
+tenant.profile.core.service.port=7000
+custos.logging.core.service.dns.name=custos-logging.custos.svc.cluster.local
+custos.logging.core.service.port=7000
+messaging.core.service.dns.name=custos-messaging-core-service.custos.svc.cluster.local
+messaging.core.service.port=7000
\ No newline at end of file
diff --git a/custos-core-services/utility-services/custos-configuration-service/src/main/resources/scimService-staging.properties b/custos-core-services/utility-services/custos-configuration-service/src/main/resources/scimService-staging.properties
new file mode 100644
index 000000000..a9268471f
--- /dev/null
+++ b/custos-core-services/utility-services/custos-configuration-service/src/main/resources/scimService-staging.properties
@@ -0,0 +1,38 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#
+
+scim.resource.user.endpoint=https://service.staging.usecustos.org/apiserver/scim/v2/Users
+scim.resource.group.endpoint=https://service.staging.usecustos.org/apiserver/scim/v2/Groups
+iam.admin.service.dns.name=iam-admin-core-service.custos.svc.cluster.local
+iam.admin.service.port=7000
+credential.store.service.dns.name=credential-store-core-service.custos.svc.cluster.local
+credential.store.service.port=7000
+federated.authentication.service.dns.name=federeted-authentication-core-service.custos.svc.cluster.local
+federated.authentication.service.port=7000
+identity.service.dns.name=identity-core-service.custos.svc.cluster.local
+identity.service.port=7000
+user.profile.core.service.dns.name=user-profile-core-service.custos.svc.cluster.local
+user.profile.core.service.port=7000
+iam.server.url=https://service.staging.usecustos.org/apiserver/auth/
+tenant.profile.core.service.dns.name=tenant-profile-core-service.custos.svc.cluster.local
+tenant.profile.core.service.port=7000
+custos.logging.core.service.dns.name=custos-logging.custos.svc.cluster.local
+custos.logging.core.service.port=7000
+messaging.core.service.dns.name=custos-messaging-core-service.custos.svc.cluster.local
+messaging.core.service.port=7000
\ No newline at end of file
diff --git a/custos-core-services/utility-services/custos-configuration-service/src/main/resources/sharingManagementService.properties b/custos-core-services/utility-services/custos-configuration-service/src/main/resources/sharingManagementService-dev.properties
similarity index 100%
rename from custos-core-services/utility-services/custos-configuration-service/src/main/resources/sharingManagementService.properties
rename to custos-core-services/utility-services/custos-configuration-service/src/main/resources/sharingManagementService-dev.properties
diff --git a/custos-core-services/utility-services/custos-configuration-service/src/main/resources/sharingManagementService-staging.properties b/custos-core-services/utility-services/custos-configuration-service/src/main/resources/sharingManagementService-staging.properties
new file mode 100644
index 000000000..84d483579
--- /dev/null
+++ b/custos-core-services/utility-services/custos-configuration-service/src/main/resources/sharingManagementService-staging.properties
@@ -0,0 +1,42 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied. See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#
+
+tenant.profile.core.service.dns.name=tenant-profile-core-service.custos.svc.cluster.local
+tenant.profile.core.service.port=7000
+iam.admin.service.dns.name=iam-admin-core-service.custos.svc.cluster.local
+iam.admin.service.port=7000
+credential.store.service.dns.name=credential-store-core-service.custos.svc.cluster.local
+credential.store.service.port=7000
+federated.authentication.service.dns.name=federeted-authentication-core-service.custos.svc.cluster.local
+federated.authentication.service.port=7000
+identity.service.dns.name=identity-core-service.custos.svc.cluster.local
+identity.service.port=7000
+user.profile.core.service.dns.name=user-profile-core-service.custos.svc.cluster.local
+user.profile.core.service.port=7000
+iam.server.url=https://service.staging.usecustos.org:30170/auth/
+sharing.core.service.dns.name=sharing-core-service.custos.svc.cluster.local
+sharing.core.service.port=7000
+custos.logging.core.service.dns.name=custos-logging.custos.svc.cluster.local
+custos.logging.core.service.port=7000
+cluster.management.core.service.dns.name=cluster-management-core-service.custos.svc.cluster.local
+cluster.management.core.service.port=7000
+resource.secret.service.dns.name=resource-secret-core-service.custos.svc.cluster.local
+resource.secret.service.port=7000
+messaging.core.service.dns.name=custos-messaging-core-service.custos.svc.cluster.local
+messaging.core.service.port=7000
\ No newline at end of file
diff --git a/custos-core-services/utility-services/custos-configuration-service/src/main/resources/tenantManagementService-dev.properties b/custos-core-services/utility-services/custos-configuration-service/src/main/resources/tenantManagementService-dev.properties
new file mode 100644
index 000000000..0f1c5df7c
--- /dev/null
+++ b/custos-core-services/utility-services/custos-configuration-service/src/main/resources/tenantManagementService-dev.properties
@@ -0,0 +1,43 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied. See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#
+
+tenant.profile.core.service.dns.name=tenant-profile-core-service.custos.svc.cluster.local
+tenant.profile.core.service.port=7000
+iam.admin.service.dns.name=iam-admin-core-service.custos.svc.cluster.local
+iam.admin.service.port=7000
+credential.store.service.dns.name=credential-store-core-service.custos.svc.cluster.local
+credential.store.service.port=7000
+federated.authentication.service.dns.name=federeted-authentication-core-service.custos.svc.cluster.local
+federated.authentication.service.port=7000
+identity.service.dns.name=identity-core-service.custos.svc.cluster.local
+identity.service.port=7000
+user.profile.core.service.dns.name=user-profile-core-service.custos.svc.cluster.local
+user.profile.core.service.port=7000
+iam.server.url=https://keycloak.custos.scigap.org:31000/auth/
+custos.logging.core.service.dns.name=custos-logging.custos.svc.cluster.local
+custos.logging.core.service.port=7000
+cluster.management.core.service.dns.name=cluster-management-core-service.custos.svc.cluster.local
+cluster.management.core.service.port=7000
+resource.secret.service.dns.name=resource-secret-core-service.custos.svc.cluster.local
+resource.secret.service.port=7000
+messaging.core.service.dns.name=custos-messaging-core-service.custos.svc.cluster.local
+messaging.core.service.port=7000
+sharing.core.service.dns.name=sharing-core-service.custos.svc.cluster.local
+sharing.core.service.port=7000
+tenant.base.uri=https://custos.scigap.org/apiserver/tenant-management/v1.0.0/oauth2/tenant
\ No newline at end of file
diff --git a/custos-core-services/utility-services/custos-configuration-service/src/main/resources/tenantManagementService.properties b/custos-core-services/utility-services/custos-configuration-service/src/main/resources/tenantManagementService-staging.properties
similarity index 85%
rename from custos-core-services/utility-services/custos-configuration-service/src/main/resources/tenantManagementService.properties
rename to custos-core-services/utility-services/custos-configuration-service/src/main/resources/tenantManagementService-staging.properties
index 9a66b09ad..bec2fc96c 100644
--- a/custos-core-services/utility-services/custos-configuration-service/src/main/resources/tenantManagementService.properties
+++ b/custos-core-services/utility-services/custos-configuration-service/src/main/resources/tenantManagementService-staging.properties
@@ -10,14 +10,13 @@ identity.service.dns.name=identity-core-service.custos.svc.cluster.local
 identity.service.port=7000
 user.profile.core.service.dns.name=user-profile-core-service.custos.svc.cluster.local
 user.profile.core.service.port=7000
-iam.server.url=https://keycloak.custos.scigap.org:31000/auth/
+iam.server.url=https://service.staging.usecustos.org:30170/auth/
 custos.logging.core.service.dns.name=custos-logging.custos.svc.cluster.local
 custos.logging.core.service.port=7000
 cluster.management.core.service.dns.name=cluster-management-core-service.custos.svc.cluster.local
 cluster.management.core.service.port=7000
 resource.secret.service.dns.name=resource-secret-core-service.custos.svc.cluster.local
 resource.secret.service.port=7000
+tenant.base.uri=https://service.staging.usecustos.org/apiserver/tenant-management/v1.0.0/oauth2/tenant
 messaging.core.service.dns.name=custos-messaging-core-service.custos.svc.cluster.local
-messaging.core.service.port=7000
-sharing.core.service.dns.name=sharing-core-service.custos.svc.cluster.local
-sharing.core.service.port=7000
\ No newline at end of file
+messaging.core.service.port=7000
\ No newline at end of file
diff --git a/custos-core-services/utility-services/custos-configuration-service/src/main/resources/userManagementService-dev.properties b/custos-core-services/utility-services/custos-configuration-service/src/main/resources/userManagementService-dev.properties
new file mode 100644
index 000000000..06a9f0987
--- /dev/null
+++ b/custos-core-services/utility-services/custos-configuration-service/src/main/resources/userManagementService-dev.properties
@@ -0,0 +1,38 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied. See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#
+
+identity.service.dns.name=identity-core-service.custos.svc.cluster.local
+identity.service.port=7000
+tenant.profile.core.service.dns.name=tenant-profile-core-service.custos.svc.cluster.local
+tenant.profile.core.service.port=7000
+credential.store.service.dns.name=credential-store-core-service.custos.svc.cluster.local
+credential.store.service.port=7000
+user.profile.core.service.dns.name=user-profile-core-service.custos.svc.cluster.local
+user.profile.core.service.port=7000
+iam.admin.service.dns.name=iam-admin-core-service.custos.svc.cluster.local
+iam.admin.service.port=7000
+iam.server.url=https://keycloak.custos.scigap.org:31000/auth/
+custos.logging.core.service.dns.name=custos-logging.custos.svc.cluster.local
+custos.logging.core.service.port=7000
+cluster.management.core.service.dns.name=cluster-management-core-service.custos.svc.cluster.local
+cluster.management.core.service.port=7000
+resource.secret.service.dns.name=resource-secret-core-service.custos.svc.cluster.local
+resource.secret.service.port=7000
+messaging.core.service.dns.name=custos-messaging-core-service.custos.svc.cluster.local
+messaging.core.service.port=7000
\ No newline at end of file
diff --git a/custos-core-services/utility-services/custos-configuration-service/src/main/resources/identityManagementService.properties b/custos-core-services/utility-services/custos-configuration-service/src/main/resources/userManagementService-staging.properties
similarity index 96%
rename from custos-core-services/utility-services/custos-configuration-service/src/main/resources/identityManagementService.properties
rename to custos-core-services/utility-services/custos-configuration-service/src/main/resources/userManagementService-staging.properties
index 149bc6048..1d4ba4f1d 100644
--- a/custos-core-services/utility-services/custos-configuration-service/src/main/resources/identityManagementService.properties
+++ b/custos-core-services/utility-services/custos-configuration-service/src/main/resources/userManagementService-staging.properties
@@ -23,11 +23,11 @@ tenant.profile.core.service.dns.name=tenant-profile-core-service.custos.svc.clus
 tenant.profile.core.service.port=7000
 credential.store.service.dns.name=credential-store-core-service.custos.svc.cluster.local
 credential.store.service.port=7000
-iam.server.url=https://keycloak.custos.scigap.org:31000/auth/
 user.profile.core.service.dns.name=user-profile-core-service.custos.svc.cluster.local
 user.profile.core.service.port=7000
 iam.admin.service.dns.name=iam-admin-core-service.custos.svc.cluster.local
 iam.admin.service.port=7000
+iam.server.url=https://service.staging.usecustos.org:30170/auth/
 custos.logging.core.service.dns.name=custos-logging.custos.svc.cluster.local
 custos.logging.core.service.port=7000
 cluster.management.core.service.dns.name=cluster-management-core-service.custos.svc.cluster.local
diff --git a/custos-external-services-distributions/custos-grpc-web-proxy/pom.xml b/custos-external-services-distributions/custos-grpc-web-proxy/pom.xml
index 4193efb18..7cd8681ef 100644
--- a/custos-external-services-distributions/custos-grpc-web-proxy/pom.xml
+++ b/custos-external-services-distributions/custos-grpc-web-proxy/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>custos-external-services-distributions</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/custos-external-services-distributions/custos-keycloak/pom.xml b/custos-external-services-distributions/custos-keycloak/pom.xml
index 37a7dba0f..cc3239cbc 100644
--- a/custos-external-services-distributions/custos-keycloak/pom.xml
+++ b/custos-external-services-distributions/custos-keycloak/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>custos-external-services-distributions</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/custos-external-services-distributions/pom.xml b/custos-external-services-distributions/pom.xml
index 9b6afddbe..85966c997 100644
--- a/custos-external-services-distributions/pom.xml
+++ b/custos-external-services-distributions/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>custos</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/custos-federated-services-clients/pom.xml b/custos-federated-services-clients/pom.xml
index 9f415cc92..dae7148dc 100644
--- a/custos-federated-services-clients/pom.xml
+++ b/custos-federated-services-clients/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>custos</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -69,11 +69,22 @@
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.custos</groupId>
+            <artifactId>cluster-management-core-service-client-stub</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
             <version>20090211</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.custos</groupId>
+            <artifactId>cluster-management-core-service-client-stub</artifactId>
+            <version>1.1-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <build>
     <plugins>
diff --git a/custos-federated-services-clients/src/main/java/org/apache/custos/federated/services/clients/keycloak/KeycloakClient.java b/custos-federated-services-clients/src/main/java/org/apache/custos/federated/services/clients/keycloak/KeycloakClient.java
index ab3797296..563e580ea 100644
--- a/custos-federated-services-clients/src/main/java/org/apache/custos/federated/services/clients/keycloak/KeycloakClient.java
+++ b/custos-federated-services-clients/src/main/java/org/apache/custos/federated/services/clients/keycloak/KeycloakClient.java
@@ -19,12 +19,10 @@
 
 package org.apache.custos.federated.services.clients.keycloak;
 
-import org.apache.catalina.security.SecurityUtil;
+import org.apache.custos.cluster.management.client.ClusterManagementClient;
 import org.apache.custos.core.services.commons.util.Constants;
 import org.apache.custos.federated.services.clients.keycloak.auth.KeycloakAuthClient;
 import org.apache.http.HttpStatus;
-import org.jboss.resteasy.client.jaxrs.ResteasyClient;
-import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;
 import org.keycloak.admin.client.Keycloak;
 import org.keycloak.admin.client.resource.*;
 import org.keycloak.representations.idm.*;
@@ -37,12 +35,7 @@
 import javax.validation.constraints.NotNull;
 import javax.ws.rs.NotFoundException;
 import javax.ws.rs.core.Response;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
 import java.net.URI;
-import java.security.KeyStore;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
@@ -54,7 +47,6 @@
 public class KeycloakClient {
     private final static Logger LOGGER = LoggerFactory.getLogger(KeycloakClient.class);
 
-
     private final static int POOL_SIZE = 10;
 
     private final static int ACCESS_TOKEN_LIFE_SPAN = 1800;
@@ -100,6 +92,12 @@ public class KeycloakClient {
     @Value("${iam.federated.cilogon.jwksUri:https://cilogon.org/oauth2/certs}")
     private String jwksUri;
 
+    @Value("${spring.profiles.active}")
+    private String activeProfile;
+
+    @Autowired
+    private ClusterManagementClient clusterManagementClient;
+
     public void createRealm(String realmId, String displayName) {
         Keycloak client = null;
         try {
@@ -166,7 +164,8 @@ public void updateRealm(String realmId, String displayName) {
         }
     }
 
-    public boolean createRealmAdminAccount(String realmId, String adminUsername, String adminFirstname, String adminLastname, String adminEmail, String adminPassword) {
+    public boolean createRealmAdminAccount(String realmId, String adminUsername, String adminFirstname,
+                                           String adminLastname, String adminEmail, String adminPassword) {
         Keycloak client = null;
         try {
             client = getClient(iamServerURL, superAdminRealmID, superAdminUserName, superAdminPassword);
@@ -222,7 +221,8 @@ public boolean createRealmAdminAccount(String realmId, String adminUsername, Str
     }
 
 
-    public boolean updateRealmAdminAccount(String realmId, String adminUsername, String adminFirstname, String adminLastname, String adminEmail, String adminPassword) {
+    public boolean updateRealmAdminAccount(String realmId, String adminUsername, String adminFirstname,
+                                           String adminLastname, String adminEmail, String adminPassword) {
         Keycloak client = null;
         try {
             client = getClient(iamServerURL, superAdminRealmID, superAdminUserName, superAdminPassword);
@@ -265,7 +265,8 @@ public boolean grantAdminPrivilege(String realmId, String username) {
 
                 String realmManagementClientId = getRealmManagementClientId(client, realmId);
 
-                retrievedUser.roles().clientLevel(realmManagementClientId).add(retrievedUser.roles().clientLevel(realmManagementClientId).listAvailable());
+                retrievedUser.roles().clientLevel(realmManagementClientId).
+                        add(retrievedUser.roles().clientLevel(realmManagementClientId).listAvailable());
                 return true;
 
             } else {
@@ -295,9 +296,11 @@ public boolean removeAdminPrivilege(String realmId, String username) {
                 RoleResource adminRoleResource = client.realm(realmId).roles().get("admin");
                 retrievedUser.roles().realmLevel().remove(Arrays.asList(adminRoleResource.toRepresentation()));
                 String realmManagementClientId = getRealmManagementClientId(client, realmId);
-                List<RoleRepresentation> representations = retrievedUser.roles().clientLevel(realmManagementClientId).listEffective();
+                List<RoleRepresentation> representations = retrievedUser.roles().
+                        clientLevel(realmManagementClientId).listEffective();
 
-                retrievedUser.roles().clientLevel(realmManagementClientId).remove(retrievedUser.roles().clientLevel(realmManagementClientId).listEffective());
+                retrievedUser.roles().clientLevel(realmManagementClientId).
+                        remove(retrievedUser.roles().clientLevel(realmManagementClientId).listEffective());
                 return true;
 
             } else {
@@ -317,7 +320,8 @@ public boolean removeAdminPrivilege(String realmId, String username) {
     }
 
 
-    public KeycloakClientSecret configureClient(String realmId, String clientName, @NotNull String tenantURL, List<String> redirectUris) {
+    public KeycloakClientSecret configureClient(String realmId, String clientName,
+                                                @NotNull String tenantURL, List<String> redirectUris) {
         Keycloak client = null;
         try {
             client = getClient(iamServerURL, superAdminRealmID, superAdminUserName, superAdminPassword);
@@ -362,13 +366,15 @@ public KeycloakClientSecret configureClient(String realmId, String clientName, @
             LOGGER.debug("Realm client configuration exited with code : " + httpResponse.getStatus() + " : " + httpResponse.getStatusInfo());
 
             // Add the manage-users role to the web client
-            UserRepresentation serviceAccountUserRepresentation = getUserByUsername(client, realmId, "service-account-" + pgaClient.getClientId());
+            UserRepresentation serviceAccountUserRepresentation =
+                    getUserByUsername(client, realmId, "service-account-" + pgaClient.getClientId());
             UserResource serviceAccountUser = client.realms().realm(realmId).users().get(serviceAccountUserRepresentation.getId());
             String realmManagementClientId = getRealmManagementClientId(client, realmId);
-            List<RoleRepresentation> manageUsersRole = serviceAccountUser.roles().clientLevel(realmManagementClientId).listAvailable()
-                    .stream()
-                    .filter(r -> r.getName().equals("manage-users"))
-                    .collect(Collectors.toList());
+            List<RoleRepresentation> manageUsersRole =
+                    serviceAccountUser.roles().clientLevel(realmManagementClientId).listAvailable()
+                            .stream()
+                            .filter(r -> r.getName().equals("manage-users"))
+                            .collect(Collectors.toList());
             serviceAccountUser.roles().clientLevel(realmManagementClientId).add(manageUsersRole);
 
             if (httpResponse.getStatus() == HttpStatus.SC_CREATED) {
@@ -394,7 +400,8 @@ public KeycloakClientSecret configureClient(String realmId, String clientName, @
     }
 
 
-    public KeycloakClientSecret updateClient(String realmId, String clientName, @NotNull String tenantURL, List<String> redirectUris) {
+    public KeycloakClientSecret updateClient(String realmId, String clientName,
+                                             @NotNull String tenantURL, List<String> redirectUris) {
         Keycloak client = null;
         try {
             client = getClient(iamServerURL, superAdminRealmID, superAdminUserName, superAdminPassword);
@@ -467,7 +474,8 @@ public boolean isUsernameAvailable(String realmId, String username, String acces
 
 
     public boolean createUser(String realmId, String username, String newPassword, String firstName,
-                              String lastName, String emailAddress, boolean tempPassowrd, String accessToken) throws UnauthorizedException {
+                              String lastName, String emailAddress,
+                              boolean tempPassowrd, String accessToken) throws UnauthorizedException {
         Keycloak client = null;
         try {
             client = getClient(iamServerURL, realmId, accessToken);
@@ -628,7 +636,8 @@ public UserRepresentation getUser(String realmId, String username) {
 
 
     public List<UserRepresentation> getUsers(String accessToken, String realmId, int offset, int limit,
-                                             String username, String firstName, String lastName, String email, String search) {
+                                             String username, String firstName, String lastName,
+                                             String email, String search) {
         Keycloak client = null;
         try {
             client = getClient(iamServerURL, realmId, accessToken);
@@ -752,7 +761,8 @@ public boolean deleteUser(String accessToken, String realmId, String username) {
     }
 
 
-    public boolean addRolesToUsers(String accessToken, String realmId, List<String> users, List<String> roles, String clientId, boolean clientLevel) {
+    public boolean addRolesToUsers(String accessToken, String realmId, List<String> users,
+                                   List<String> roles, String clientId, boolean clientLevel) {
 
         Keycloak client = null;
         try {
@@ -796,7 +806,8 @@ public boolean addRolesToUsers(String accessToken, String realmId, List<String>
     }
 
 
-    public boolean removeRoleFromUser(String accessToken, String realmId, String username, List<String> roles, String clientId, boolean clientLevel) {
+    public boolean removeRoleFromUser(String accessToken, String realmId, String username,
+                                      List<String> roles, String clientId, boolean clientLevel) {
 
         Keycloak client = null;
         try {
@@ -856,6 +867,7 @@ public boolean deleteRealm(String realmId) {
         Keycloak client = null;
         try {
             // get client
+            LOGGER.info("IAM server URL "+ iamServerURL);
             client = getClient(iamServerURL, superAdminRealmID, superAdminUserName, superAdminPassword);
 
             RealmResource realmResource = client.realm(realmId);
@@ -1900,63 +1912,18 @@ private boolean isValidEndUser(Keycloak client, String realmId, String username)
     }
 
 
-    private ResteasyClient getRestClient() {
-        return new ResteasyClientBuilder()
-                .establishConnectionTimeout(100, TimeUnit.SECONDS)
-                .socketTimeout(10, TimeUnit.SECONDS)
-                .connectionPoolSize(POOL_SIZE)
-                .trustStore(loadKeyStore())
-                .build();
-    }
+
 
     private Keycloak getClient(String adminUrl, String realm, String loginUsername, String password) {
 
         return KeycloakUtils.getClient(adminUrl, realm, loginUsername,
-                password, clientId, trustStorePath, truststorePassword);
+                password, clientId, trustStorePath, truststorePassword, activeProfile, clusterManagementClient);
     }
 
     private Keycloak getClient(String adminUrl, String realm, String accessToken) {
 
-        return KeycloakUtils.getClient(adminUrl, realm, accessToken, trustStorePath, truststorePassword);
-    }
-
-    private KeyStore loadKeyStore() {
-
-        InputStream is = null;
-        try {
-
-
-            File trustStoreFile = new File(trustStorePath);
-
-            if (trustStoreFile.exists()) {
-                LOGGER.debug("Loading trust store file from path " + trustStorePath);
-                is = new FileInputStream(trustStorePath);
-            } else {
-                LOGGER.debug("Trying to load trust store file form class path " + trustStorePath);
-                is = SecurityUtil.class.getClassLoader().getResourceAsStream(trustStorePath);
-                if (is != null) {
-                    LOGGER.debug("Trust store file was loaded form class path " + trustStorePath);
-                }
-            }
-
-            if (is == null) {
-                throw new RuntimeException("Could not find a trust store file in path " + trustStorePath);
-            }
-
-            KeyStore ks = KeyStore.getInstance(KeyStore.getDefaultType());
-            ks.load(is, truststorePassword.toCharArray());
-            return ks;
-        } catch (Exception e) {
-            throw new RuntimeException("Failed to load trust store KeyStore instance", e);
-        } finally {
-            if (is != null) {
-                try {
-                    is.close();
-                } catch (IOException e) {
-                    LOGGER.error("Failed to close trust store FileInputStream", e);
-                }
-            }
-        }
+        return KeycloakUtils.getClient(adminUrl, realm, accessToken, trustStorePath, truststorePassword,
+                activeProfile, clusterManagementClient);
     }
 
 
diff --git a/custos-federated-services-clients/src/main/java/org/apache/custos/federated/services/clients/keycloak/KeycloakUtils.java b/custos-federated-services-clients/src/main/java/org/apache/custos/federated/services/clients/keycloak/KeycloakUtils.java
index 7ab530a13..88d26a48d 100644
--- a/custos-federated-services-clients/src/main/java/org/apache/custos/federated/services/clients/keycloak/KeycloakUtils.java
+++ b/custos-federated-services-clients/src/main/java/org/apache/custos/federated/services/clients/keycloak/KeycloakUtils.java
@@ -20,6 +20,9 @@
 package org.apache.custos.federated.services.clients.keycloak;
 
 import org.apache.catalina.security.SecurityUtil;
+import org.apache.custos.cluster.management.client.ClusterManagementClient;
+import org.apache.custos.cluster.management.service.GetServerCertificateRequest;
+import org.apache.custos.cluster.management.service.GetServerCertificateResponse;
 import org.jboss.resteasy.client.jaxrs.ResteasyClient;
 import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;
 import org.keycloak.admin.client.Keycloak;
@@ -35,8 +38,10 @@
 import java.security.KeyStore;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
+import java.security.cert.Certificate;
 import java.security.cert.CertificateException;
 import java.util.concurrent.TimeUnit;
+import java.security.cert.CertificateFactory;
 
 public class KeycloakUtils {
 
@@ -45,20 +50,22 @@ public class KeycloakUtils {
     private static final Logger LOGGER = LoggerFactory.getLogger(KeycloakUtils.class);
 
 
-    public static Keycloak getClient (String serverURL, String realm, String accessToken,
-                                      String trustStorePath, String trustorePassword) {
+    public static Keycloak getClient(String serverURL, String realm, String accessToken,
+                                     String trustStorePath, String trustorePassword, String profile,
+                                     ClusterManagementClient clusterManagementClient) {
 
         return KeycloakBuilder.builder()
                 .serverUrl(serverURL)
                 .realm(realm)
                 .authorization(accessToken)
-                .resteasyClient(getRestClient(trustStorePath,trustorePassword))
+                .resteasyClient(getRestClient(trustStorePath, trustorePassword, profile, clusterManagementClient))
                 .build();
     }
 
 
     public static Keycloak getClient(String serverURL, String realm, String loginUsername,
-                                     String password, String clientId, String trustStorePath, String trustorePassword) {
+                                     String password, String clientId, String trustStorePath, String trustorePassword, String profile,
+                                     ClusterManagementClient clusterManagementClient) {
 
         return KeycloakBuilder.builder()
                 .serverUrl(serverURL)
@@ -66,46 +73,68 @@ public static Keycloak getClient(String serverURL, String realm, String loginUse
                 .username(loginUsername)
                 .password(password)
                 .clientId(clientId)
-                .resteasyClient(getRestClient(trustStorePath, trustorePassword))
+                .resteasyClient(getRestClient(trustStorePath, trustorePassword, profile, clusterManagementClient))
                 .build();
     }
 
 
-    private static ResteasyClient getRestClient(String trustorePath, String trustorePassword) {
+    private static ResteasyClient getRestClient(String trustorePath, String trustorePassword, String profile,
+                                                ClusterManagementClient clusterManagementClient) {
         return new ResteasyClientBuilder()
                 .establishConnectionTimeout(100, TimeUnit.SECONDS)
                 .socketTimeout(10, TimeUnit.SECONDS)
                 .connectionPoolSize(POOL_SIZE)
-                .trustStore(loadKeyStore(trustorePath, trustorePassword))
+                .trustStore(loadKeyStore(trustorePath, trustorePassword, profile, clusterManagementClient))
                 .build();
     }
 
 
-    private static KeyStore loadKeyStore(String trustStorePath, String trustorePassword) {
+    private static KeyStore loadKeyStore(String trustStorePath, String trustorePassword,
+                                         String profile, ClusterManagementClient clusterManagementClient) {
 
         InputStream is = null;
         try {
 
+            KeyStore ks = KeyStore.getInstance(KeyStore.getDefaultType());
+            LOGGER.info("Profile " + profile);
+            if (profile.equals("staging") || profile.equals("prod")) {
+                LOGGER.info("Profile inside  " + profile);
+                GetServerCertificateRequest getServerCertificateRequest = GetServerCertificateRequest
+                        .newBuilder()
+                        .setNamespace("keycloak")
+                        .setSecretName("tls-keycloak-secret")
+                        .build();
+                GetServerCertificateResponse response = clusterManagementClient.getCustosServerCertificate(getServerCertificateRequest);
+                CertificateFactory cf = CertificateFactory.getInstance("X.509");
+                LOGGER.info(response.getCertificate());
+                InputStream targetStream = new ByteArrayInputStream(response.getCertificate().getBytes());
+                Certificate certs = cf.generateCertificate(targetStream);
+                // Add the certificate
+                ks.load(null, null);
+                ks.setCertificateEntry("custos", certs);
 
-            File trustStoreFile = new File(trustStorePath);
-
-            if (trustStoreFile.exists()) {
-                LOGGER.debug("Loading trust store file from path " + trustStorePath);
-                is = new FileInputStream(trustStorePath);
             } else {
-                LOGGER.debug("Trying to load trust store file form class path " + trustStorePath);
-                is = SecurityUtil.class.getClassLoader().getResourceAsStream(trustStorePath);
-                if (is != null) {
-                    LOGGER.debug("Trust store file was loaded form class path " + trustStorePath);
+
+                File trustStoreFile = new File(trustStorePath);
+
+                if (trustStoreFile.exists()) {
+                    LOGGER.debug("Loading trust store file from path " + trustStorePath);
+                    is = new FileInputStream(trustStorePath);
+                } else {
+                    LOGGER.debug("Trying to load trust store file form class path " + trustStorePath);
+                    is = SecurityUtil.class.getClassLoader().getResourceAsStream(trustStorePath);
+                    if (is != null) {
+                        LOGGER.debug("Trust store file was loaded form class path " + trustStorePath);
+                    }
                 }
-            }
 
-            if (is == null) {
-                throw new RuntimeException("Could not find a trust store file in path " + trustStorePath);
-            }
+                if (is == null) {
+                    throw new RuntimeException("Could not find a trust store file in path " + trustStorePath);
+                }
 
-            KeyStore ks = KeyStore.getInstance(KeyStore.getDefaultType());
-            ks.load(is, trustorePassword.toCharArray());
+
+                ks.load(is, trustorePassword.toCharArray());
+            }
             return ks;
         } catch (Exception e) {
             throw new RuntimeException("Failed to load trust store KeyStore instance", e);
@@ -121,9 +150,26 @@ private static KeyStore loadKeyStore(String trustStorePath, String trustorePassw
     }
 
 
-    public static SSLContext initializeTrustStoreManager(String trustStorePath, String trustStorePassword) throws
+    public static SSLContext initializeTrustStoreManager(String trustStorePath, String trustStorePassword,
+                                                         String profile, ClusterManagementClient clusterManagementClient) throws
             IOException, KeyStoreException, CertificateException, NoSuchAlgorithmException, KeyManagementException {
 
+        KeyStore trustStore = KeyStore.getInstance(KeyStore.getDefaultType());
+        if (profile.equals("staging") || profile.equals("prod")) {
+            GetServerCertificateRequest getServerCertificateRequest = GetServerCertificateRequest
+                    .newBuilder()
+                    .setNamespace("keycloak")
+                    .setSecretName("tls-keycloak-secret")
+                    .build();
+            GetServerCertificateResponse response = clusterManagementClient.getCustosServerCertificate(getServerCertificateRequest);
+            CertificateFactory cf = CertificateFactory.getInstance("X.509");
+            InputStream targetStream = new ByteArrayInputStream(response.getCertificate().getBytes());
+            Certificate certs = cf.generateCertificate(targetStream);
+            trustStore.load(null, null);
+            trustStore.setCertificateEntry("custos", certs);
+
+
+        } else {
             File trustStoreFile = new File(trustStorePath);
             InputStream is;
             if (trustStoreFile.exists()) {
@@ -140,29 +186,24 @@ public static SSLContext initializeTrustStoreManager(String trustStorePath, Stri
             if (is == null) {
                 throw new RuntimeException("Could not find a trust store file in path " + trustStorePath);
             }
-
-            KeyStore trustStore = KeyStore.getInstance(KeyStore.getDefaultType());
-
             char[] trustPassword = trustStorePassword.toCharArray();
-
             trustStore.load(is, trustPassword);
+        }
 
-            // initialize a trust manager factory
-            TrustManagerFactory trustFactory =
-                    TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
-            trustFactory.init(trustStore);
-
-            // get the trust managers from the factory
-            TrustManager[] trustManagers = trustFactory.getTrustManagers();
-
-            // initialize an ssl context to use these managers and set as default
-            SSLContext sslContext = SSLContext.getInstance("SSL");
-            sslContext.init(null, trustManagers, null);
-            SSLContext.setDefault(sslContext);
 
+        // initialize a trust manager factory
+        TrustManagerFactory trustFactory =
+                TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+        trustFactory.init(trustStore);
 
+        // get the trust managers from the factory
+        TrustManager[] trustManagers = trustFactory.getTrustManagers();
 
-            return sslContext;
+        // initialize an ssl context to use these managers and set as default
+        SSLContext sslContext = SSLContext.getInstance("SSL");
+        sslContext.init(null, trustManagers, null);
+        SSLContext.setDefault(sslContext);
+        return sslContext;
 
     }
 
diff --git a/custos-federated-services-clients/src/main/java/org/apache/custos/federated/services/clients/keycloak/auth/KeycloakAuthClient.java b/custos-federated-services-clients/src/main/java/org/apache/custos/federated/services/clients/keycloak/auth/KeycloakAuthClient.java
index 4c410e644..bc973d97a 100644
--- a/custos-federated-services-clients/src/main/java/org/apache/custos/federated/services/clients/keycloak/auth/KeycloakAuthClient.java
+++ b/custos-federated-services-clients/src/main/java/org/apache/custos/federated/services/clients/keycloak/auth/KeycloakAuthClient.java
@@ -19,6 +19,7 @@
 
 package org.apache.custos.federated.services.clients.keycloak.auth;
 
+import org.apache.custos.cluster.management.client.ClusterManagementClient;
 import org.apache.custos.federated.services.clients.keycloak.KeycloakUtils;
 import org.apache.http.Consts;
 import org.apache.http.HttpHeaders;
@@ -41,6 +42,7 @@
 import org.keycloak.representations.AccessTokenResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.context.event.EventListener;
@@ -97,6 +99,12 @@ public class KeycloakAuthClient {
     @Value("${user.info.endpoint}")
     private String userInfoEndpoint;
 
+    @Value("${spring.profiles.active}")
+    private String activeProfile;
+
+    @Autowired
+    private ClusterManagementClient clusterManagementClient;
+
     private static final Logger LOGGER = LoggerFactory.getLogger(KeycloakAuthClient.class);
 
     public KeycloakAuthClient() {
@@ -108,7 +116,8 @@ public void initializeSecurity() throws CertificateException, NoSuchAlgorithmExc
             KeyStoreException, KeyManagementException, IOException {
         try {
             LOGGER.info("initializing security requirements");
-            KeycloakUtils.initializeTrustStoreManager(trustStorePath, trustStorePassword);
+            KeycloakUtils.initializeTrustStoreManager(trustStorePath, trustStorePassword,
+                    activeProfile, clusterManagementClient);
         } catch (Exception ex) {
             LOGGER.error("Keycloak Authclient initialization failed " + ex.getMessage());
             throw ex;
diff --git a/custos-integration-core/pom.xml b/custos-integration-core/pom.xml
index 7fb086dd7..5867dd638 100644
--- a/custos-integration-core/pom.xml
+++ b/custos-integration-core/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>custos</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/custos-integration-services/agent-management-service-parent/agent-management-service-sidecar/pom.xml b/custos-integration-services/agent-management-service-parent/agent-management-service-sidecar/pom.xml
index 4609d5b74..0556c8b8c 100644
--- a/custos-integration-services/agent-management-service-parent/agent-management-service-sidecar/pom.xml
+++ b/custos-integration-services/agent-management-service-parent/agent-management-service-sidecar/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>agent-management-service-parent</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/custos-integration-services/agent-management-service-parent/agent-management-service/pom.xml b/custos-integration-services/agent-management-service-parent/agent-management-service/pom.xml
index fc0dfc238..366a6b4ad 100644
--- a/custos-integration-services/agent-management-service-parent/agent-management-service/pom.xml
+++ b/custos-integration-services/agent-management-service-parent/agent-management-service/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>agent-management-service-parent</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -118,6 +118,7 @@
             <groupId>com.google.api.grpc</groupId>
             <artifactId>proto-google-common-protos</artifactId>
         </dependency>
+
     </dependencies>
 
     <build>
@@ -136,6 +137,13 @@
                     <skip>false</skip>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <configuration>
+                    <skip>false</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/helm/templates/deployment.yaml b/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/helm/templates/deployment.yaml
index a0957f6b1..668c290e3 100644
--- a/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/helm/templates/deployment.yaml
+++ b/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/helm/templates/deployment.yaml
@@ -6,9 +6,10 @@ metadata:
 {{ include "helm.labels" . | indent 4 }}
 spec:
   replicas: {{ .Values.replicaCount }}
-  rollingUpdate:
-    maxSurge: {{ .Values.rollingUpdate.maxSurge }}
-    maxUnavailable: {{ .Values.rollingUpdate.maxUnavailable }}
+  strategy:
+    rollingUpdate:
+      maxSurge: {{ .Values.rollingUpdate.maxSurge }}
+      maxUnavailable: {{ .Values.rollingUpdate.maxUnavailable }}
   selector:
     matchLabels:
       app.kubernetes.io/name: {{ include "helm.name" . }}
@@ -45,9 +46,9 @@ spec:
             httpGet:
               path: /actuator/health
               port: {{ .Values.service.port }}
-              initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
-              periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
-              successThreshold: {{ .Values.readinessProbe.successThreshold }}
+            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+            successThreshold: {{ .Values.readinessProbe.successThreshold }}
           resources:
               {{- toYaml .Values.resources | nindent 12 }}
         - name: {{ .Chart.Name }}-envoy-proxy
diff --git a/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/helm/templates/ingress-grpc.yaml b/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/helm/templates/ingress-grpc.yaml
index ebf2b9d6e..d253c1a42 100644
--- a/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/helm/templates/ingress-grpc.yaml
+++ b/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/helm/templates/ingress-grpc.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   annotations:
@@ -8,7 +8,7 @@ metadata:
   name: ${artifactId}-ingress-grpc
 spec:
   rules:
-     - host: custos.scigap.org
+     - host: {{ .Values.deployment.host }}
        http:
         paths:
           - path: /org.apache.custos.agent.management.service.AgentManagementService(/|$)(.*)
@@ -18,5 +18,5 @@ spec:
 
   tls:
     - hosts:
-        - custos.scigap.org
+        - {{ .Values.deployment.host }}
       secretName: tls-secret
\ No newline at end of file
diff --git a/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/helm/templates/ingress.yaml b/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/helm/templates/ingress.yaml
index de5372256..36d23f620 100644
--- a/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/helm/templates/ingress.yaml
+++ b/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/helm/templates/ingress.yaml
@@ -7,7 +7,7 @@ metadata:
     cert-manager.io/cluster-issuer: letsencrypt-production
 spec:
   rules:
-    - host: custos.scigap.org
+    - host: {{ .Values.deployment.host }}
       http:
         paths:
           - path: /agent-management(/|$)(.*)
@@ -17,5 +17,5 @@ spec:
 
   tls:
     - hosts:
-        - custos.scigap.org
+        - {{ .Values.deployment.host }}
       secretName: tls-secret
\ No newline at end of file
diff --git a/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/helm/values.yaml b/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/helm/values.yaml
index d83557dba..6b6953ac6 100644
--- a/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/helm/values.yaml
+++ b/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/helm/values.yaml
@@ -70,7 +70,7 @@ affinity: {}
 
 proxy:
    repository: apachecustos/agent-management-service-sidecar
-   tag: 1.0-SNAPSHOT
+   tag: 1.1-SNAPSHOT
    port: 50000
    adminport: 9901
 
@@ -82,4 +82,7 @@ rollingUpdate:
 readinessProbe:
   initialDelaySeconds: 5
   periodSeconds: 1
-  successThreshold: 1
\ No newline at end of file
+  successThreshold: 1
+
+deployment:
+  host: custos.scigap.org
\ No newline at end of file
diff --git a/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/resources/application.properties b/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/resources/application.properties
index 46960c90a..502049251 100644
--- a/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/resources/application.properties
+++ b/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/resources/application.properties
@@ -24,4 +24,5 @@ spring.sleuth.sampler.probability=1
 management.security.enabled=false
 management.endpoints.web.exposure.include=*
 management.endpoint.metrics.enabled=true
-spring.main.allow-bean-definition-overriding=true
\ No newline at end of file
+spring.main.allow-bean-definition-overriding=true
+spring.profiles.active=@spring.profiles.active@
\ No newline at end of file
diff --git a/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/resources/bootstrap.properties b/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/resources/bootstrap.properties
index 4b7ed78c3..5ba4b1d58 100644
--- a/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/resources/bootstrap.properties
+++ b/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/resources/bootstrap.properties
@@ -19,4 +19,4 @@
 
 spring.cloud.config.uri=http://custos-configuration-service.custos.svc.cluster.local:9000
 #spring.cloud.config.uri=http://localhost:9000
-spring.profiles.active:default
+spring.profiles.active=@spring.profiles.active@
diff --git a/custos-integration-services/agent-management-service-parent/pom.xml b/custos-integration-services/agent-management-service-parent/pom.xml
index 957d7c80c..25be36417 100644
--- a/custos-integration-services/agent-management-service-parent/pom.xml
+++ b/custos-integration-services/agent-management-service-parent/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>custos-integration-services</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/custos-integration-services/custos-integration-services-commons/pom.xml b/custos-integration-services/custos-integration-services-commons/pom.xml
index 80f31630e..8ee33af0f 100644
--- a/custos-integration-services/custos-integration-services-commons/pom.xml
+++ b/custos-integration-services/custos-integration-services-commons/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>custos-integration-services</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/custos-integration-services/custos-integration-services-swagger/pom.xml b/custos-integration-services/custos-integration-services-swagger/pom.xml
index 140a5a3f2..8083f9904 100644
--- a/custos-integration-services/custos-integration-services-swagger/pom.xml
+++ b/custos-integration-services/custos-integration-services-swagger/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>custos-integration-services</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/custos-integration-services/group-management-service-parent/group-management-service-sidecar/pom.xml b/custos-integration-services/group-management-service-parent/group-management-service-sidecar/pom.xml
index 324bfe2da..1c3035a4a 100644
--- a/custos-integration-services/group-management-service-parent/group-management-service-sidecar/pom.xml
+++ b/custos-integration-services/group-management-service-parent/group-management-service-sidecar/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>group-management-service-parent</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/custos-integration-services/group-management-service-parent/group-management-service/pom.xml b/custos-integration-services/group-management-service-parent/group-management-service/pom.xml
index 1ac8b6f27..ea191f99c 100644
--- a/custos-integration-services/group-management-service-parent/group-management-service/pom.xml
+++ b/custos-integration-services/group-management-service-parent/group-management-service/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>group-management-service-parent</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -114,6 +114,7 @@
             <groupId>com.google.api.grpc</groupId>
             <artifactId>proto-google-common-protos</artifactId>
         </dependency>
+
     </dependencies>
 
     <build>
@@ -132,6 +133,13 @@
                     <skip>false</skip>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <configuration>
+                    <skip>false</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/custos-integration-services/group-management-service-parent/group-management-service/src/main/helm/templates/deployment.yaml b/custos-integration-services/group-management-service-parent/group-management-service/src/main/helm/templates/deployment.yaml
index a0957f6b1..668c290e3 100644
--- a/custos-integration-services/group-management-service-parent/group-management-service/src/main/helm/templates/deployment.yaml
+++ b/custos-integration-services/group-management-service-parent/group-management-service/src/main/helm/templates/deployment.yaml
@@ -6,9 +6,10 @@ metadata:
 {{ include "helm.labels" . | indent 4 }}
 spec:
   replicas: {{ .Values.replicaCount }}
-  rollingUpdate:
-    maxSurge: {{ .Values.rollingUpdate.maxSurge }}
-    maxUnavailable: {{ .Values.rollingUpdate.maxUnavailable }}
+  strategy:
+    rollingUpdate:
+      maxSurge: {{ .Values.rollingUpdate.maxSurge }}
+      maxUnavailable: {{ .Values.rollingUpdate.maxUnavailable }}
   selector:
     matchLabels:
       app.kubernetes.io/name: {{ include "helm.name" . }}
@@ -45,9 +46,9 @@ spec:
             httpGet:
               path: /actuator/health
               port: {{ .Values.service.port }}
-              initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
-              periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
-              successThreshold: {{ .Values.readinessProbe.successThreshold }}
+            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+            successThreshold: {{ .Values.readinessProbe.successThreshold }}
           resources:
               {{- toYaml .Values.resources | nindent 12 }}
         - name: {{ .Chart.Name }}-envoy-proxy
diff --git a/custos-integration-services/group-management-service-parent/group-management-service/src/main/helm/templates/ingress-grpc.yaml b/custos-integration-services/group-management-service-parent/group-management-service/src/main/helm/templates/ingress-grpc.yaml
index 727abc111..29e45a37c 100644
--- a/custos-integration-services/group-management-service-parent/group-management-service/src/main/helm/templates/ingress-grpc.yaml
+++ b/custos-integration-services/group-management-service-parent/group-management-service/src/main/helm/templates/ingress-grpc.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   annotations:
@@ -8,7 +8,7 @@ metadata:
   name: ${artifactId}-ingress-grpc
 spec:
   rules:
-    - host: custos.scigap.org
+    - host: {{ .Values.deployment.host }}
       http:
         paths:
           - path: /org.apache.custos.group.management.service.GroupManagementService(/|$)(.*)
@@ -18,5 +18,5 @@ spec:
 
   tls:
     - hosts:
-        - custos.scigap.org
+        - {{ .Values.deployment.host }}
       secretName: tls-secret
\ No newline at end of file
diff --git a/custos-integration-services/group-management-service-parent/group-management-service/src/main/helm/templates/ingress.yaml b/custos-integration-services/group-management-service-parent/group-management-service/src/main/helm/templates/ingress.yaml
index 70f30294f..af22d9530 100644
--- a/custos-integration-services/group-management-service-parent/group-management-service/src/main/helm/templates/ingress.yaml
+++ b/custos-integration-services/group-management-service-parent/group-management-service/src/main/helm/templates/ingress.yaml
@@ -7,7 +7,7 @@ metadata:
     cert-manager.io/cluster-issuer: letsencrypt-production
 spec:
   rules:
-    - host: custos.scigap.org
+    - host: {{ .Values.deployment.host }}
       http:
         paths:
           - path: /group-management(/|$)(.*)
@@ -17,5 +17,5 @@ spec:
 
   tls:
     - hosts:
-        - custos.scigap.org
+        - {{ .Values.deployment.host }}
       secretName: tls-secret
\ No newline at end of file
diff --git a/custos-integration-services/group-management-service-parent/group-management-service/src/main/helm/values.yaml b/custos-integration-services/group-management-service-parent/group-management-service/src/main/helm/values.yaml
index fc25587ef..e2c45013a 100644
--- a/custos-integration-services/group-management-service-parent/group-management-service/src/main/helm/values.yaml
+++ b/custos-integration-services/group-management-service-parent/group-management-service/src/main/helm/values.yaml
@@ -70,7 +70,7 @@ affinity: {}
 
 proxy:
    repository: apachecustos/group-management-service-sidecar
-   tag: 1.0-SNAPSHOT
+   tag: 1.1-SNAPSHOT
    port: 50000
    adminport: 9901
 
@@ -82,3 +82,6 @@ readinessProbe:
   initialDelaySeconds: 5
   periodSeconds: 1
   successThreshold: 1
+
+deployment:
+  host: custos.scigap.org
\ No newline at end of file
diff --git a/custos-integration-services/group-management-service-parent/group-management-service/src/main/resources/application.properties b/custos-integration-services/group-management-service-parent/group-management-service/src/main/resources/application.properties
index 3af668127..3767f76e2 100644
--- a/custos-integration-services/group-management-service-parent/group-management-service/src/main/resources/application.properties
+++ b/custos-integration-services/group-management-service-parent/group-management-service/src/main/resources/application.properties
@@ -25,4 +25,5 @@ spring.sleuth.sampler.probability=1
 management.security.enabled=false
 management.endpoints.web.exposure.include=*
 management.endpoint.metrics.enabled=true
-spring.main.allow-bean-definition-overriding=true
\ No newline at end of file
+spring.main.allow-bean-definition-overriding=true
+spring.profiles.active=@spring.profiles.active@
\ No newline at end of file
diff --git a/custos-integration-services/group-management-service-parent/group-management-service/src/main/resources/bootstrap.properties b/custos-integration-services/group-management-service-parent/group-management-service/src/main/resources/bootstrap.properties
index 4b7ed78c3..5ba4b1d58 100644
--- a/custos-integration-services/group-management-service-parent/group-management-service/src/main/resources/bootstrap.properties
+++ b/custos-integration-services/group-management-service-parent/group-management-service/src/main/resources/bootstrap.properties
@@ -19,4 +19,4 @@
 
 spring.cloud.config.uri=http://custos-configuration-service.custos.svc.cluster.local:9000
 #spring.cloud.config.uri=http://localhost:9000
-spring.profiles.active:default
+spring.profiles.active=@spring.profiles.active@
diff --git a/custos-integration-services/group-management-service-parent/pom.xml b/custos-integration-services/group-management-service-parent/pom.xml
index c0151ceea..0a5848dcf 100644
--- a/custos-integration-services/group-management-service-parent/pom.xml
+++ b/custos-integration-services/group-management-service-parent/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>custos-integration-services</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/custos-integration-services/identity-management-service-parent/identity-management-service-sidecar/pom.xml b/custos-integration-services/identity-management-service-parent/identity-management-service-sidecar/pom.xml
index 13472578d..b109a8b8e 100644
--- a/custos-integration-services/identity-management-service-parent/identity-management-service-sidecar/pom.xml
+++ b/custos-integration-services/identity-management-service-parent/identity-management-service-sidecar/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>identity-management-service-parent</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/custos-integration-services/identity-management-service-parent/identity-management-service/pom.xml b/custos-integration-services/identity-management-service-parent/identity-management-service/pom.xml
index fbec0b74a..58eab8477 100644
--- a/custos-integration-services/identity-management-service-parent/identity-management-service/pom.xml
+++ b/custos-integration-services/identity-management-service-parent/identity-management-service/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>identity-management-service-parent</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -106,6 +106,7 @@
             <groupId>com.google.api.grpc</groupId>
             <artifactId>proto-google-common-protos</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.apache.custos</groupId>
             <artifactId>messaging-core-service-client-stub</artifactId>
@@ -134,6 +135,13 @@
                     <skip>false</skip>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <configuration>
+                    <skip>false</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/helm/templates/deployment.yaml b/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/helm/templates/deployment.yaml
index a0957f6b1..4ba779eeb 100644
--- a/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/helm/templates/deployment.yaml
+++ b/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/helm/templates/deployment.yaml
@@ -6,9 +6,10 @@ metadata:
 {{ include "helm.labels" . | indent 4 }}
 spec:
   replicas: {{ .Values.replicaCount }}
-  rollingUpdate:
-    maxSurge: {{ .Values.rollingUpdate.maxSurge }}
-    maxUnavailable: {{ .Values.rollingUpdate.maxUnavailable }}
+  strategy:
+    rollingUpdate:
+      maxSurge: {{ .Values.rollingUpdate.maxSurge }}
+      maxUnavailable: {{ .Values.rollingUpdate.maxUnavailable }}
   selector:
     matchLabels:
       app.kubernetes.io/name: {{ include "helm.name" . }}
@@ -16,7 +17,7 @@ spec:
   template:
     metadata:
       annotations:
-        linkerd.io/inject: enabled
+#        linkerd.io/inject: enabled
       labels:
         app.kubernetes.io/name: {{ include "helm.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
@@ -45,9 +46,9 @@ spec:
             httpGet:
               path: /actuator/health
               port: {{ .Values.service.port }}
-              initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
-              periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
-              successThreshold: {{ .Values.readinessProbe.successThreshold }}
+            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+            successThreshold: {{ .Values.readinessProbe.successThreshold }}
           resources:
               {{- toYaml .Values.resources | nindent 12 }}
         - name: {{ .Chart.Name }}-envoy-proxy
diff --git a/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/helm/templates/ingress-grpc.yaml b/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/helm/templates/ingress-grpc.yaml
index 0fbbed621..4200e90db 100644
--- a/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/helm/templates/ingress-grpc.yaml
+++ b/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/helm/templates/ingress-grpc.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   annotations:
@@ -8,7 +8,7 @@ metadata:
   name: ${artifactId}-ingress-grpc
 spec:
   rules:
-     - host: custos.scigap.org
+     - host: {{ .Values.deployment.host }}
        http:
         paths:
          - path: /org.apache.custos.identity.management.service.IdentityManagementService(/|$)(.*)
@@ -18,5 +18,5 @@ spec:
 
   tls:
     - hosts:
-        - custos.scigap.org
+        - {{ .Values.deployment.host }}
       secretName: tls-secret
\ No newline at end of file
diff --git a/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/helm/templates/ingress.yaml b/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/helm/templates/ingress.yaml
index 078bfee94..1e59c91f5 100644
--- a/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/helm/templates/ingress.yaml
+++ b/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/helm/templates/ingress.yaml
@@ -7,7 +7,7 @@ metadata:
     cert-manager.io/cluster-issuer: letsencrypt-production
 spec:
   rules:
-    - host: custos.scigap.org
+    - host: {{ .Values.deployment.host }}
       http:
         paths:
           - path: /identity-management(/|$)(.*)
@@ -17,5 +17,5 @@ spec:
 
   tls:
     - hosts:
-        - custos.scigap.org
+        - {{ .Values.deployment.host }}
       secretName: tls-secret
\ No newline at end of file
diff --git a/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/helm/values.yaml b/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/helm/values.yaml
index b79f6ef2f..4e85c3640 100644
--- a/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/helm/values.yaml
+++ b/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/helm/values.yaml
@@ -70,7 +70,7 @@ affinity: {}
 
 proxy:
    repository: apachecustos/identity-management-service-sidecar
-   tag: 1.0-SNAPSHOT
+   tag: 1.1-SNAPSHOT
    port: 50000
    adminport: 9901
 
@@ -82,4 +82,7 @@ rollingUpdate:
 readinessProbe:
   initialDelaySeconds: 5
   periodSeconds: 1
-  successThreshold: 1
\ No newline at end of file
+  successThreshold: 1
+
+deployment:
+  host: custos.scigap.org
\ No newline at end of file
diff --git a/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/java/org/apache/custos/identity/management/interceptors/AuthInterceptorImpl.java b/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/java/org/apache/custos/identity/management/interceptors/AuthInterceptorImpl.java
index b00bc2b43..1691f30e8 100644
--- a/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/java/org/apache/custos/identity/management/interceptors/AuthInterceptorImpl.java
+++ b/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/java/org/apache/custos/identity/management/interceptors/AuthInterceptorImpl.java
@@ -57,6 +57,7 @@ public AuthInterceptorImpl(CredentialStoreServiceClient credentialStoreServiceCl
     @Override
     public <ReqT> ReqT intercept(String method, Metadata headers, ReqT reqT) {
 
+        LOGGER.info("request received ....." + method);
         if (method.equals("authorize") || method.equals("getAgentToken") || method.equals("endAgentSession")) {
             return reqT;
         }
diff --git a/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/java/org/apache/custos/identity/management/service/IdentityManagementService.java b/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/java/org/apache/custos/identity/management/service/IdentityManagementService.java
index b2efea65a..2e45e7f7b 100644
--- a/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/java/org/apache/custos/identity/management/service/IdentityManagementService.java
+++ b/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/java/org/apache/custos/identity/management/service/IdentityManagementService.java
@@ -270,7 +270,7 @@ public void token(GetTokenRequest request, StreamObserver<Struct> responseObserv
     @Override
     public void getOIDCConfiguration(GetOIDCConfiguration request, StreamObserver<Struct> responseObserver) {
         try {
-            LOGGER.debug("Request received  to fetch OIDC configuration " + request.getTenantId());
+            LOGGER.info("Request received  to fetch OIDC configuration " + request.getTenantId());
 
             String clientId = request.getClientId();
 
diff --git a/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/resources/application.properties b/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/resources/application.properties
index f63fe564d..882a9bdd4 100644
--- a/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/resources/application.properties
+++ b/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/resources/application.properties
@@ -24,4 +24,5 @@ spring.sleuth.sampler.probability=1
 management.security.enabled=false
 management.endpoints.web.exposure.include=*
 management.endpoint.metrics.enabled=true
-spring.main.allow-bean-definition-overriding=true
\ No newline at end of file
+spring.main.allow-bean-definition-overriding=true
+spring.profiles.active=@spring.profiles.active@
\ No newline at end of file
diff --git a/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/resources/bootstrap.properties b/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/resources/bootstrap.properties
index 4b7ed78c3..5ba4b1d58 100644
--- a/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/resources/bootstrap.properties
+++ b/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/resources/bootstrap.properties
@@ -19,4 +19,4 @@
 
 spring.cloud.config.uri=http://custos-configuration-service.custos.svc.cluster.local:9000
 #spring.cloud.config.uri=http://localhost:9000
-spring.profiles.active:default
+spring.profiles.active=@spring.profiles.active@
diff --git a/custos-integration-services/identity-management-service-parent/pom.xml b/custos-integration-services/identity-management-service-parent/pom.xml
index 5f83745b1..6ab832c81 100644
--- a/custos-integration-services/identity-management-service-parent/pom.xml
+++ b/custos-integration-services/identity-management-service-parent/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>custos-integration-services</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/custos-integration-services/log-management-service-parent/log-management-service-sidecar/pom.xml b/custos-integration-services/log-management-service-parent/log-management-service-sidecar/pom.xml
index 49911b6c8..42ee88da0 100644
--- a/custos-integration-services/log-management-service-parent/log-management-service-sidecar/pom.xml
+++ b/custos-integration-services/log-management-service-parent/log-management-service-sidecar/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>log-management-service-parent</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/custos-integration-services/log-management-service-parent/log-management-service/pom.xml b/custos-integration-services/log-management-service-parent/log-management-service/pom.xml
index e9e05e75a..da29219f9 100644
--- a/custos-integration-services/log-management-service-parent/log-management-service/pom.xml
+++ b/custos-integration-services/log-management-service-parent/log-management-service/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>log-management-service-parent</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -141,7 +141,7 @@
         <dependency>
             <groupId>org.apache.custos</groupId>
             <artifactId>custos-logging-client-stub</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>1.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
@@ -163,6 +163,13 @@
                     <skip>false</skip>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <configuration>
+                    <skip>false</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/custos-integration-services/log-management-service-parent/log-management-service/src/main/helm/templates/deployment.yaml b/custos-integration-services/log-management-service-parent/log-management-service/src/main/helm/templates/deployment.yaml
index a0957f6b1..668c290e3 100644
--- a/custos-integration-services/log-management-service-parent/log-management-service/src/main/helm/templates/deployment.yaml
+++ b/custos-integration-services/log-management-service-parent/log-management-service/src/main/helm/templates/deployment.yaml
@@ -6,9 +6,10 @@ metadata:
 {{ include "helm.labels" . | indent 4 }}
 spec:
   replicas: {{ .Values.replicaCount }}
-  rollingUpdate:
-    maxSurge: {{ .Values.rollingUpdate.maxSurge }}
-    maxUnavailable: {{ .Values.rollingUpdate.maxUnavailable }}
+  strategy:
+    rollingUpdate:
+      maxSurge: {{ .Values.rollingUpdate.maxSurge }}
+      maxUnavailable: {{ .Values.rollingUpdate.maxUnavailable }}
   selector:
     matchLabels:
       app.kubernetes.io/name: {{ include "helm.name" . }}
@@ -45,9 +46,9 @@ spec:
             httpGet:
               path: /actuator/health
               port: {{ .Values.service.port }}
-              initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
-              periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
-              successThreshold: {{ .Values.readinessProbe.successThreshold }}
+            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+            successThreshold: {{ .Values.readinessProbe.successThreshold }}
           resources:
               {{- toYaml .Values.resources | nindent 12 }}
         - name: {{ .Chart.Name }}-envoy-proxy
diff --git a/custos-integration-services/log-management-service-parent/log-management-service/src/main/helm/templates/ingress-grpc.yaml b/custos-integration-services/log-management-service-parent/log-management-service/src/main/helm/templates/ingress-grpc.yaml
index aa9584019..26fcd4aed 100644
--- a/custos-integration-services/log-management-service-parent/log-management-service/src/main/helm/templates/ingress-grpc.yaml
+++ b/custos-integration-services/log-management-service-parent/log-management-service/src/main/helm/templates/ingress-grpc.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   annotations:
@@ -8,7 +8,7 @@ metadata:
   name: ${artifactId}-ingress-grpc
 spec:
   rules:
-     - host: custos.scigap.org
+     - host: {{ .Values.deployment.host }}
        http:
         paths:
           - path: /org.apache.custos.log.management.service.LogManagementService(/|$)(.*)
@@ -18,5 +18,5 @@ spec:
 
   tls:
     - hosts:
-        - custos.scigap.org
+        - {{ .Values.deployment.host }}
       secretName: tls-secret
\ No newline at end of file
diff --git a/custos-integration-services/log-management-service-parent/log-management-service/src/main/helm/templates/ingress.yaml b/custos-integration-services/log-management-service-parent/log-management-service/src/main/helm/templates/ingress.yaml
index 708e8abcb..64b7f2f67 100644
--- a/custos-integration-services/log-management-service-parent/log-management-service/src/main/helm/templates/ingress.yaml
+++ b/custos-integration-services/log-management-service-parent/log-management-service/src/main/helm/templates/ingress.yaml
@@ -7,7 +7,7 @@ metadata:
     cert-manager.io/cluster-issuer: letsencrypt-production
 spec:
   rules:
-    - host: custos.scigap.org
+    - host: {{ .Values.deployment.host }}
       http:
         paths:
           - path: /log-management(/|$)(.*)
@@ -17,5 +17,5 @@ spec:
 
   tls:
     - hosts:
-        - custos.scigap.org
+        - {{ .Values.deployment.host }}
       secretName: tls-secret
\ No newline at end of file
diff --git a/custos-integration-services/log-management-service-parent/log-management-service/src/main/helm/values.yaml b/custos-integration-services/log-management-service-parent/log-management-service/src/main/helm/values.yaml
index 6b816014d..30e070837 100644
--- a/custos-integration-services/log-management-service-parent/log-management-service/src/main/helm/values.yaml
+++ b/custos-integration-services/log-management-service-parent/log-management-service/src/main/helm/values.yaml
@@ -75,7 +75,7 @@ role:
 
 proxy:
    repository: apachecustos/log-management-service-sidecar
-   tag: 1.0-SNAPSHOT
+   tag: 1.1-SNAPSHOT
    port: 50000
    webport: 50001
    adminport: 9901
@@ -89,3 +89,6 @@ readinessProbe:
   initialDelaySeconds: 5
   periodSeconds: 1
   successThreshold: 1
+
+deployment:
+  host: custos.scigap.org
\ No newline at end of file
diff --git a/custos-integration-services/log-management-service-parent/log-management-service/src/main/resources/application.properties b/custos-integration-services/log-management-service-parent/log-management-service/src/main/resources/application.properties
index 7b72b955a..8111e5fbf 100644
--- a/custos-integration-services/log-management-service-parent/log-management-service/src/main/resources/application.properties
+++ b/custos-integration-services/log-management-service-parent/log-management-service/src/main/resources/application.properties
@@ -24,4 +24,5 @@ spring.sleuth.sampler.probability=1
 management.security.enabled=false
 management.endpoints.web.exposure.include=*
 management.endpoint.metrics.enabled=true
-spring.main.allow-bean-definition-overriding=true
\ No newline at end of file
+spring.main.allow-bean-definition-overriding=true
+spring.profiles.active=@spring.profiles.active@
\ No newline at end of file
diff --git a/custos-integration-services/log-management-service-parent/log-management-service/src/main/resources/bootstrap.properties b/custos-integration-services/log-management-service-parent/log-management-service/src/main/resources/bootstrap.properties
index 4b7ed78c3..5ba4b1d58 100644
--- a/custos-integration-services/log-management-service-parent/log-management-service/src/main/resources/bootstrap.properties
+++ b/custos-integration-services/log-management-service-parent/log-management-service/src/main/resources/bootstrap.properties
@@ -19,4 +19,4 @@
 
 spring.cloud.config.uri=http://custos-configuration-service.custos.svc.cluster.local:9000
 #spring.cloud.config.uri=http://localhost:9000
-spring.profiles.active:default
+spring.profiles.active=@spring.profiles.active@
diff --git a/custos-integration-services/log-management-service-parent/pom.xml b/custos-integration-services/log-management-service-parent/pom.xml
index 745aae805..994165202 100644
--- a/custos-integration-services/log-management-service-parent/pom.xml
+++ b/custos-integration-services/log-management-service-parent/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>custos-integration-services</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/custos-integration-services/pom.xml b/custos-integration-services/pom.xml
index 47fc27888..33e1a7c73 100644
--- a/custos-integration-services/pom.xml
+++ b/custos-integration-services/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>custos</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>custos-integration-services</artifactId>
diff --git a/custos-integration-services/resource-secret-management-service-parent/pom.xml b/custos-integration-services/resource-secret-management-service-parent/pom.xml
index a3fe1434a..da644b988 100644
--- a/custos-integration-services/resource-secret-management-service-parent/pom.xml
+++ b/custos-integration-services/resource-secret-management-service-parent/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>custos-integration-services</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service-sidecar/pom.xml b/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service-sidecar/pom.xml
index e9705de98..34ca03e5f 100644
--- a/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service-sidecar/pom.xml
+++ b/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service-sidecar/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>resource-secret-management-service-parent</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/pom.xml b/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/pom.xml
index e4972c4d1..8d4e7b758 100644
--- a/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/pom.xml
+++ b/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>resource-secret-management-service-parent</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -133,6 +133,7 @@
             <groupId>io.kubernetes</groupId>
             <artifactId>client-java</artifactId>
         </dependency>
+
     </dependencies>
 
     <build>
@@ -151,6 +152,13 @@
                     <skip>false</skip>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <configuration>
+                    <skip>false</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/helm/templates/deployment.yaml b/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/helm/templates/deployment.yaml
index a0957f6b1..668c290e3 100644
--- a/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/helm/templates/deployment.yaml
+++ b/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/helm/templates/deployment.yaml
@@ -6,9 +6,10 @@ metadata:
 {{ include "helm.labels" . | indent 4 }}
 spec:
   replicas: {{ .Values.replicaCount }}
-  rollingUpdate:
-    maxSurge: {{ .Values.rollingUpdate.maxSurge }}
-    maxUnavailable: {{ .Values.rollingUpdate.maxUnavailable }}
+  strategy:
+    rollingUpdate:
+      maxSurge: {{ .Values.rollingUpdate.maxSurge }}
+      maxUnavailable: {{ .Values.rollingUpdate.maxUnavailable }}
   selector:
     matchLabels:
       app.kubernetes.io/name: {{ include "helm.name" . }}
@@ -45,9 +46,9 @@ spec:
             httpGet:
               path: /actuator/health
               port: {{ .Values.service.port }}
-              initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
-              periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
-              successThreshold: {{ .Values.readinessProbe.successThreshold }}
+            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+            successThreshold: {{ .Values.readinessProbe.successThreshold }}
           resources:
               {{- toYaml .Values.resources | nindent 12 }}
         - name: {{ .Chart.Name }}-envoy-proxy
diff --git a/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/helm/templates/ingress-grpc.yaml b/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/helm/templates/ingress-grpc.yaml
index 3c97bc2f2..efdc37a4e 100644
--- a/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/helm/templates/ingress-grpc.yaml
+++ b/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/helm/templates/ingress-grpc.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   annotations:
@@ -8,7 +8,7 @@ metadata:
   name: ${artifactId}-ingress-grpc
 spec:
   rules:
-     - host: custos.scigap.org
+     - host: {{ .Values.deployment.host }}
        http:
         paths:
           - path: /org.apache.custos.resource.secret.management.service.ResourceSecretManagementService(/|$)(.*)
@@ -18,5 +18,5 @@ spec:
 
   tls:
     - hosts:
-        - custos.scigap.org
+        - {{ .Values.deployment.host }}
       secretName: tls-secret
\ No newline at end of file
diff --git a/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/helm/templates/ingress.yaml b/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/helm/templates/ingress.yaml
index b71a1d0f3..fb98f1111 100644
--- a/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/helm/templates/ingress.yaml
+++ b/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/helm/templates/ingress.yaml
@@ -7,7 +7,7 @@ metadata:
     cert-manager.io/cluster-issuer: letsencrypt-production
 spec:
   rules:
-    - host: custos.scigap.org
+    - host: {{ .Values.deployment.host }}
       http:
         paths:
           - path: /resource-secret-management(/|$)(.*)
@@ -17,5 +17,5 @@ spec:
 
   tls:
     - hosts:
-        - custos.scigap.org
+        - {{ .Values.deployment.host }}
       secretName: tls-secret
\ No newline at end of file
diff --git a/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/helm/values.yaml b/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/helm/values.yaml
index 0928901e8..a22d799a9 100644
--- a/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/helm/values.yaml
+++ b/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/helm/values.yaml
@@ -75,7 +75,7 @@ role:
 
 proxy:
    repository: apachecustos/resource-secret-management-service-sidecar
-   tag: 1.0-SNAPSHOT
+   tag: 1.1-SNAPSHOT
    port: 50000
    webport: 50001
    adminport: 9901
@@ -88,3 +88,6 @@ readinessProbe:
   initialDelaySeconds: 5
   periodSeconds: 1
   successThreshold: 1
+
+deployment:
+  host: custos.scigap.org
\ No newline at end of file
diff --git a/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/resources/application.properties b/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/resources/application.properties
index 74e61518c..33d266df0 100644
--- a/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/resources/application.properties
+++ b/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/resources/application.properties
@@ -24,4 +24,5 @@ spring.sleuth.sampler.probability=1
 management.security.enabled=false
 management.endpoints.web.exposure.include=*
 management.endpoint.metrics.enabled=true
-spring.main.allow-bean-definition-overriding=true
\ No newline at end of file
+spring.main.allow-bean-definition-overriding=true
+spring.profiles.active=@spring.profiles.active@
\ No newline at end of file
diff --git a/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/resources/bootstrap.properties b/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/resources/bootstrap.properties
index 4b7ed78c3..5ba4b1d58 100644
--- a/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/resources/bootstrap.properties
+++ b/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/resources/bootstrap.properties
@@ -19,4 +19,4 @@
 
 spring.cloud.config.uri=http://custos-configuration-service.custos.svc.cluster.local:9000
 #spring.cloud.config.uri=http://localhost:9000
-spring.profiles.active:default
+spring.profiles.active=@spring.profiles.active@
diff --git a/custos-integration-services/scim-service/pom.xml b/custos-integration-services/scim-service/pom.xml
index 0ab3971cb..354e10340 100644
--- a/custos-integration-services/scim-service/pom.xml
+++ b/custos-integration-services/scim-service/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>custos-integration-services</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -122,6 +122,7 @@
             <artifactId>tenant-profile-core-service-client-stub</artifactId>
             <version>${project.version}</version>
         </dependency>
+
     </dependencies>
 
     <build>
@@ -140,6 +141,13 @@
                     <skip>false</skip>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <configuration>
+                    <skip>false</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/custos-integration-services/scim-service/src/main/helm/templates/deployment.yaml b/custos-integration-services/scim-service/src/main/helm/templates/deployment.yaml
index 8cc78dce8..202764018 100644
--- a/custos-integration-services/scim-service/src/main/helm/templates/deployment.yaml
+++ b/custos-integration-services/scim-service/src/main/helm/templates/deployment.yaml
@@ -44,9 +44,9 @@ spec:
             httpGet:
               path: /actuator/health
               port: {{ .Values.service.port }}
-              initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
-              periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
-              successThreshold: {{ .Values.readinessProbe.successThreshold }}
+            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+            successThreshold: {{ .Values.readinessProbe.successThreshold }}
           resources:
               {{- toYaml .Values.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}
diff --git a/custos-integration-services/scim-service/src/main/helm/templates/ingress.yaml b/custos-integration-services/scim-service/src/main/helm/templates/ingress.yaml
index 5f90e0403..3e53ca3fb 100644
--- a/custos-integration-services/scim-service/src/main/helm/templates/ingress.yaml
+++ b/custos-integration-services/scim-service/src/main/helm/templates/ingress.yaml
@@ -8,7 +8,7 @@ metadata:
     cert-manager.io/cluster-issuer: letsencrypt-production
 spec:
   rules:
-    - host: custos.scigap.org
+    - host: {{ .Values.deployment.host }}
       http:
         paths:
           - path: /scim(/|$)(.*)
@@ -18,5 +18,5 @@ spec:
 
   tls:
     - hosts:
-        - custos.scigap.org
+        - {{ .Values.deployment.host }}
       secretName: tls-secret
\ No newline at end of file
diff --git a/custos-integration-services/scim-service/src/main/helm/values.yaml b/custos-integration-services/scim-service/src/main/helm/values.yaml
index 24389a2ff..5ee18e9db 100644
--- a/custos-integration-services/scim-service/src/main/helm/values.yaml
+++ b/custos-integration-services/scim-service/src/main/helm/values.yaml
@@ -78,5 +78,6 @@ readinessProbe:
   successThreshold: 1
 
 
-
+deployment:
+  host: custos.scigap.org
 
diff --git a/custos-integration-services/scim-service/src/main/resources/application.properties b/custos-integration-services/scim-service/src/main/resources/application.properties
index 480f8fe05..ccd2d0d57 100644
--- a/custos-integration-services/scim-service/src/main/resources/application.properties
+++ b/custos-integration-services/scim-service/src/main/resources/application.properties
@@ -26,4 +26,4 @@ management.endpoints.web.exposure.include=*
 management.endpoint.metrics.enabled=true
 spring.main.allow-bean-definition-overriding=true
 logging.level.root=INFO
-#logging.level.org.springframework.web=INFO
\ No newline at end of file
+spring.profiles.active=@spring.profiles.active@
\ No newline at end of file
diff --git a/custos-integration-services/scim-service/src/main/resources/bootstrap.properties b/custos-integration-services/scim-service/src/main/resources/bootstrap.properties
index 4b7ed78c3..5ba4b1d58 100644
--- a/custos-integration-services/scim-service/src/main/resources/bootstrap.properties
+++ b/custos-integration-services/scim-service/src/main/resources/bootstrap.properties
@@ -19,4 +19,4 @@
 
 spring.cloud.config.uri=http://custos-configuration-service.custos.svc.cluster.local:9000
 #spring.cloud.config.uri=http://localhost:9000
-spring.profiles.active:default
+spring.profiles.active=@spring.profiles.active@
diff --git a/custos-integration-services/sharing-management-service-parent/pom.xml b/custos-integration-services/sharing-management-service-parent/pom.xml
index 75c1b8d8b..1f2fc99ba 100644
--- a/custos-integration-services/sharing-management-service-parent/pom.xml
+++ b/custos-integration-services/sharing-management-service-parent/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>custos-integration-services</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/custos-integration-services/sharing-management-service-parent/sharing-management-service-sidecar/pom.xml b/custos-integration-services/sharing-management-service-parent/sharing-management-service-sidecar/pom.xml
index 217936284..63d8378d7 100644
--- a/custos-integration-services/sharing-management-service-parent/sharing-management-service-sidecar/pom.xml
+++ b/custos-integration-services/sharing-management-service-parent/sharing-management-service-sidecar/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>sharing-management-service-parent</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/custos-integration-services/sharing-management-service-parent/sharing-management-service/pom.xml b/custos-integration-services/sharing-management-service-parent/sharing-management-service/pom.xml
index 9015d9f7d..dfeb962d7 100644
--- a/custos-integration-services/sharing-management-service-parent/sharing-management-service/pom.xml
+++ b/custos-integration-services/sharing-management-service-parent/sharing-management-service/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>sharing-management-service-parent</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -123,6 +123,7 @@
             <groupId>com.google.api.grpc</groupId>
             <artifactId>proto-google-common-protos</artifactId>
         </dependency>
+
     </dependencies>
 
     <build>
@@ -141,6 +142,13 @@
                     <skip>false</skip>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <configuration>
+                    <skip>false</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/helm/templates/deployment.yaml b/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/helm/templates/deployment.yaml
index 2fe140f87..9fe298c77 100644
--- a/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/helm/templates/deployment.yaml
+++ b/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/helm/templates/deployment.yaml
@@ -6,9 +6,10 @@ metadata:
 {{ include "helm.labels" . | indent 4 }}
 spec:
   replicas: {{ .Values.replicaCount }}
-  rollingUpdate:
-    maxSurge: {{ .Values.rollingUpdate.maxSurge }}
-    maxUnavailable: {{ .Values.rollingUpdate.maxUnavailable }}
+  strategy:
+    rollingUpdate:
+      maxSurge: {{ .Values.rollingUpdate.maxSurge }}
+      maxUnavailable: {{ .Values.rollingUpdate.maxUnavailable }}
   selector:
     matchLabels:
       app.kubernetes.io/name: {{ include "helm.name" . }}
@@ -59,9 +60,9 @@ spec:
             httpGet:
               path: /actuator/health
               port: {{ .Values.service.port }}
-              initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
-              periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
-              successThreshold: {{ .Values.readinessProbe.successThreshold }}
+            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+            successThreshold: {{ .Values.readinessProbe.successThreshold }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}
diff --git a/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/helm/templates/ingress-grpc.yaml b/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/helm/templates/ingress-grpc.yaml
index 3fe743db5..ce0a4f1c2 100644
--- a/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/helm/templates/ingress-grpc.yaml
+++ b/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/helm/templates/ingress-grpc.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   annotations:
@@ -8,7 +8,7 @@ metadata:
   name: ${artifactId}-ingress-grpc
 spec:
   rules:
-     - host: custos.scigap.org
+     - host: {{ .Values.deployment.host }}
        http:
         paths:
           - path: /org.apache.custos.sharing.management.service.SharingManagementService(/|$)(.*)
@@ -18,5 +18,5 @@ spec:
 
   tls:
     - hosts:
-        - custos.scigap.org
+        - {{ .Values.deployment.host }}
       secretName: tls-secret
\ No newline at end of file
diff --git a/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/helm/templates/ingress.yaml b/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/helm/templates/ingress.yaml
index 634f5a88f..002207d6a 100644
--- a/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/helm/templates/ingress.yaml
+++ b/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/helm/templates/ingress.yaml
@@ -7,7 +7,7 @@ metadata:
     cert-manager.io/cluster-issuer: letsencrypt-production
 spec:
   rules:
-    - host: custos.scigap.org
+    - host: {{ .Values.deployment.host }}
       http:
         paths:
           - path: /sharing-management(/|$)(.*)
@@ -17,5 +17,5 @@ spec:
 
   tls:
     - hosts:
-        - custos.scigap.org
+        - {{ .Values.deployment.host }}
       secretName: tls-secret
\ No newline at end of file
diff --git a/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/helm/values.yaml b/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/helm/values.yaml
index 292eba68a..92f7449b9 100644
--- a/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/helm/values.yaml
+++ b/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/helm/values.yaml
@@ -70,7 +70,7 @@ affinity: {}
 
 proxy:
    repository: apachecustos/sharing-management-service-sidecar
-   tag: 1.0-SNAPSHOT
+   tag: 1.1-SNAPSHOT
    port: 50000
    adminport: 9901
 
@@ -82,3 +82,6 @@ readinessProbe:
   initialDelaySeconds: 5
   periodSeconds: 1
   successThreshold: 1
+
+deployment:
+  host: custos.scigap.org
\ No newline at end of file
diff --git a/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/resources/application.properties b/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/resources/application.properties
index fe296f14f..be1dafa29 100644
--- a/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/resources/application.properties
+++ b/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/resources/application.properties
@@ -24,4 +24,5 @@ spring.sleuth.sampler.probability=1
 management.security.enabled=false
 management.endpoints.web.exposure.include=*
 management.endpoint.metrics.enabled=true
-spring.main.allow-bean-definition-overriding=true
\ No newline at end of file
+spring.main.allow-bean-definition-overriding=true
+spring.profiles.active=@spring.profiles.active@
\ No newline at end of file
diff --git a/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/resources/bootstrap.properties b/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/resources/bootstrap.properties
index 4b7ed78c3..5ba4b1d58 100644
--- a/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/resources/bootstrap.properties
+++ b/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/resources/bootstrap.properties
@@ -19,4 +19,4 @@
 
 spring.cloud.config.uri=http://custos-configuration-service.custos.svc.cluster.local:9000
 #spring.cloud.config.uri=http://localhost:9000
-spring.profiles.active:default
+spring.profiles.active=@spring.profiles.active@
diff --git a/custos-integration-services/tenant-management-service-parent/pom.xml b/custos-integration-services/tenant-management-service-parent/pom.xml
index 0dbe2b362..3a37a58bc 100644
--- a/custos-integration-services/tenant-management-service-parent/pom.xml
+++ b/custos-integration-services/tenant-management-service-parent/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>custos-integration-services</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/custos-integration-services/tenant-management-service-parent/tenant-management-service-sidecar/pom.xml b/custos-integration-services/tenant-management-service-parent/tenant-management-service-sidecar/pom.xml
index 4f293deee..a6596b2b9 100644
--- a/custos-integration-services/tenant-management-service-parent/tenant-management-service-sidecar/pom.xml
+++ b/custos-integration-services/tenant-management-service-parent/tenant-management-service-sidecar/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>tenant-management-service-parent</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/custos-integration-services/tenant-management-service-parent/tenant-management-service/pom.xml b/custos-integration-services/tenant-management-service-parent/tenant-management-service/pom.xml
index 25f082dc9..27ab6317d 100644
--- a/custos-integration-services/tenant-management-service-parent/tenant-management-service/pom.xml
+++ b/custos-integration-services/tenant-management-service-parent/tenant-management-service/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>tenant-management-service-parent</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -134,13 +134,13 @@
         <dependency>
             <groupId>org.apache.custos</groupId>
             <artifactId>messaging-core-service-client-stub</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>1.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.custos</groupId>
             <artifactId>sharing-core-service-client-stub</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>1.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
@@ -161,6 +161,13 @@
                     <skip>false</skip>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <configuration>
+                    <skip>false</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/helm/templates/deployment.yaml b/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/helm/templates/deployment.yaml
index 2fe140f87..9fe298c77 100644
--- a/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/helm/templates/deployment.yaml
+++ b/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/helm/templates/deployment.yaml
@@ -6,9 +6,10 @@ metadata:
 {{ include "helm.labels" . | indent 4 }}
 spec:
   replicas: {{ .Values.replicaCount }}
-  rollingUpdate:
-    maxSurge: {{ .Values.rollingUpdate.maxSurge }}
-    maxUnavailable: {{ .Values.rollingUpdate.maxUnavailable }}
+  strategy:
+    rollingUpdate:
+      maxSurge: {{ .Values.rollingUpdate.maxSurge }}
+      maxUnavailable: {{ .Values.rollingUpdate.maxUnavailable }}
   selector:
     matchLabels:
       app.kubernetes.io/name: {{ include "helm.name" . }}
@@ -59,9 +60,9 @@ spec:
             httpGet:
               path: /actuator/health
               port: {{ .Values.service.port }}
-              initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
-              periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
-              successThreshold: {{ .Values.readinessProbe.successThreshold }}
+            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+            successThreshold: {{ .Values.readinessProbe.successThreshold }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}
diff --git a/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/helm/templates/ingress-grpc.yaml b/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/helm/templates/ingress-grpc.yaml
index afc27467d..196224953 100644
--- a/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/helm/templates/ingress-grpc.yaml
+++ b/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/helm/templates/ingress-grpc.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   annotations:
@@ -8,7 +8,7 @@ metadata:
   name: ${artifactId}-ingress-grpc
 spec:
   rules:
-     - host: custos.scigap.org
+     - host: {{ .Values.deployment.host }}
        http:
         paths:
           - path: /org.apache.custos.tenant.management.service.TenantManagementService(/|$)(.*)
@@ -18,5 +18,5 @@ spec:
 
   tls:
     - hosts:
-        - custos.scigap.org
+        - {{ .Values.deployment.host }}
       secretName: tls-secret
\ No newline at end of file
diff --git a/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/helm/templates/ingress.yaml b/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/helm/templates/ingress.yaml
index 98f3b2851..dca76f7bb 100644
--- a/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/helm/templates/ingress.yaml
+++ b/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/helm/templates/ingress.yaml
@@ -7,7 +7,7 @@ metadata:
     cert-manager.io/cluster-issuer: letsencrypt-production
 spec:
   rules:
-    - host: custos.scigap.org
+    - host: {{ .Values.deployment.host }}
       http:
         paths:
           - path: /tenant-management(/|$)(.*)
@@ -17,5 +17,5 @@ spec:
 
   tls:
     - hosts:
-        - custos.scigap.org
+        - {{ .Values.deployment.host }}
       secretName: tls-secret
\ No newline at end of file
diff --git a/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/helm/values.yaml b/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/helm/values.yaml
index 059067a47..bb53ce5aa 100644
--- a/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/helm/values.yaml
+++ b/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/helm/values.yaml
@@ -70,7 +70,7 @@ affinity: {}
 
 proxy:
    repository: apachecustos/tenant-management-service-sidecar
-   tag: 1.0-SNAPSHOT
+   tag: 1.1-SNAPSHOT
    port: 50000
    adminport: 9901
 
@@ -82,3 +82,6 @@ readinessProbe:
   initialDelaySeconds: 5
   periodSeconds: 1
   successThreshold: 1
+
+deployment:
+  host: custos.scigap.org
\ No newline at end of file
diff --git a/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/java/org/apache/custos/tenant/management/service/TenantManagementService.java b/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/java/org/apache/custos/tenant/management/service/TenantManagementService.java
index 1e041d417..39ba845d5 100644
--- a/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/java/org/apache/custos/tenant/management/service/TenantManagementService.java
+++ b/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/java/org/apache/custos/tenant/management/service/TenantManagementService.java
@@ -53,6 +53,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -84,6 +85,9 @@ public class TenantManagementService extends TenantManagementServiceImplBase {
     @Autowired
     private IdentityClient identityClient;
 
+    @Value("${tenant.base.uri}")
+    private String TENANT_BASE_URI;
+
     @Autowired
     private MessagingClient messagingClient;
 
@@ -128,7 +132,7 @@ public void createTenant(Tenant request, StreamObserver<CreateTenantResponse> re
 
             }
 
-            String tenantBaseURI = Constants.TENANT_BASE_URI + "?client_id=" + resp.getId();
+            String tenantBaseURI = TENANT_BASE_URI + "?client_id=" + resp.getId();
 
 
             CreateTenantResponse tenantResponse = CreateTenantResponse.newBuilder()
diff --git a/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/resources/application.properties b/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/resources/application.properties
index 49b6041da..7bfb302e7 100644
--- a/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/resources/application.properties
+++ b/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/resources/application.properties
@@ -24,4 +24,5 @@ spring.sleuth.sampler.probability=1
 management.security.enabled=false
 management.endpoints.web.exposure.include=*
 management.endpoint.metrics.enabled=true
-spring.main.allow-bean-definition-overriding=true
\ No newline at end of file
+spring.main.allow-bean-definition-overriding=true
+spring.profiles.active=@spring.profiles.active@
\ No newline at end of file
diff --git a/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/resources/bootstrap.properties b/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/resources/bootstrap.properties
index 4b7ed78c3..5ba4b1d58 100644
--- a/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/resources/bootstrap.properties
+++ b/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/resources/bootstrap.properties
@@ -19,4 +19,4 @@
 
 spring.cloud.config.uri=http://custos-configuration-service.custos.svc.cluster.local:9000
 #spring.cloud.config.uri=http://localhost:9000
-spring.profiles.active:default
+spring.profiles.active=@spring.profiles.active@
diff --git a/custos-integration-services/user-management-service-parent/pom.xml b/custos-integration-services/user-management-service-parent/pom.xml
index 5c8d26b6b..a134822cc 100644
--- a/custos-integration-services/user-management-service-parent/pom.xml
+++ b/custos-integration-services/user-management-service-parent/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>custos-integration-services</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/custos-integration-services/user-management-service-parent/user-management-service-sidecar/pom.xml b/custos-integration-services/user-management-service-parent/user-management-service-sidecar/pom.xml
index b1d2b7749..1989e0be5 100644
--- a/custos-integration-services/user-management-service-parent/user-management-service-sidecar/pom.xml
+++ b/custos-integration-services/user-management-service-parent/user-management-service-sidecar/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>user-management-service-parent</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/custos-integration-services/user-management-service-parent/user-management-service/pom.xml b/custos-integration-services/user-management-service-parent/user-management-service/pom.xml
index 23c254dac..dbbb92067 100644
--- a/custos-integration-services/user-management-service-parent/user-management-service/pom.xml
+++ b/custos-integration-services/user-management-service-parent/user-management-service/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>user-management-service-parent</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -132,6 +132,13 @@
                     <skip>false</skip>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <configuration>
+                    <skip>false</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/custos-integration-services/user-management-service-parent/user-management-service/src/main/helm/templates/deployment.yaml b/custos-integration-services/user-management-service-parent/user-management-service/src/main/helm/templates/deployment.yaml
index 2fe140f87..9fe298c77 100644
--- a/custos-integration-services/user-management-service-parent/user-management-service/src/main/helm/templates/deployment.yaml
+++ b/custos-integration-services/user-management-service-parent/user-management-service/src/main/helm/templates/deployment.yaml
@@ -6,9 +6,10 @@ metadata:
 {{ include "helm.labels" . | indent 4 }}
 spec:
   replicas: {{ .Values.replicaCount }}
-  rollingUpdate:
-    maxSurge: {{ .Values.rollingUpdate.maxSurge }}
-    maxUnavailable: {{ .Values.rollingUpdate.maxUnavailable }}
+  strategy:
+    rollingUpdate:
+      maxSurge: {{ .Values.rollingUpdate.maxSurge }}
+      maxUnavailable: {{ .Values.rollingUpdate.maxUnavailable }}
   selector:
     matchLabels:
       app.kubernetes.io/name: {{ include "helm.name" . }}
@@ -59,9 +60,9 @@ spec:
             httpGet:
               path: /actuator/health
               port: {{ .Values.service.port }}
-              initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
-              periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
-              successThreshold: {{ .Values.readinessProbe.successThreshold }}
+            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+            successThreshold: {{ .Values.readinessProbe.successThreshold }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}
diff --git a/custos-integration-services/user-management-service-parent/user-management-service/src/main/helm/templates/ingress-grpc.yaml b/custos-integration-services/user-management-service-parent/user-management-service/src/main/helm/templates/ingress-grpc.yaml
index c8f348713..cb1b712c2 100644
--- a/custos-integration-services/user-management-service-parent/user-management-service/src/main/helm/templates/ingress-grpc.yaml
+++ b/custos-integration-services/user-management-service-parent/user-management-service/src/main/helm/templates/ingress-grpc.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   annotations:
@@ -8,7 +8,7 @@ metadata:
   name: ${artifactId}-ingress-grpc
 spec:
   rules:
-    - host: custos.scigap.org
+    - host: {{ .Values.deployment.host }}
       http:
         paths:
           - path: /org.apache.custos.user.management.service.UserManagementService(/|$)(.*)
@@ -18,5 +18,5 @@ spec:
 
   tls:
     - hosts:
-        - custos.scigap.org
+        - {{ .Values.deployment.host }}
       secretName: tls-secret
\ No newline at end of file
diff --git a/custos-integration-services/user-management-service-parent/user-management-service/src/main/helm/templates/ingress.yaml b/custos-integration-services/user-management-service-parent/user-management-service/src/main/helm/templates/ingress.yaml
index fd24a5767..d5d248b83 100644
--- a/custos-integration-services/user-management-service-parent/user-management-service/src/main/helm/templates/ingress.yaml
+++ b/custos-integration-services/user-management-service-parent/user-management-service/src/main/helm/templates/ingress.yaml
@@ -7,7 +7,7 @@ metadata:
     cert-manager.io/cluster-issuer: letsencrypt-production
 spec:
   rules:
-    - host: custos.scigap.org
+    - host: {{ .Values.deployment.host }}
       http:
         paths:
           - path: /user-management(/|$)(.*)
@@ -17,5 +17,5 @@ spec:
 
   tls:
     - hosts:
-        - custos.scigap.org
+        - {{ .Values.deployment.host }}
       secretName: tls-secret
\ No newline at end of file
diff --git a/custos-integration-services/user-management-service-parent/user-management-service/src/main/helm/values.yaml b/custos-integration-services/user-management-service-parent/user-management-service/src/main/helm/values.yaml
index a516b9c58..68b0a0007 100644
--- a/custos-integration-services/user-management-service-parent/user-management-service/src/main/helm/values.yaml
+++ b/custos-integration-services/user-management-service-parent/user-management-service/src/main/helm/values.yaml
@@ -70,7 +70,7 @@ affinity: {}
 
 proxy:
    repository: apachecustos/user-management-service-sidecar
-   tag: 1.0-SNAPSHOT
+   tag: 1.1-SNAPSHOT
    port: 50000
    adminport: 9901
 
@@ -82,3 +82,6 @@ readinessProbe:
   initialDelaySeconds: 5
   periodSeconds: 1
   successThreshold: 1
+
+deployment:
+  host: custos.scigap.org
\ No newline at end of file
diff --git a/custos-integration-services/user-management-service-parent/user-management-service/src/main/resources/application.properties b/custos-integration-services/user-management-service-parent/user-management-service/src/main/resources/application.properties
index 5798f476a..9a39c36b3 100644
--- a/custos-integration-services/user-management-service-parent/user-management-service/src/main/resources/application.properties
+++ b/custos-integration-services/user-management-service-parent/user-management-service/src/main/resources/application.properties
@@ -25,4 +25,5 @@ spring.sleuth.sampler.probability=1
 management.security.enabled=false
 management.endpoints.web.exposure.include=*
 management.endpoint.metrics.enabled=true
-spring.main.allow-bean-definition-overriding=true
\ No newline at end of file
+spring.main.allow-bean-definition-overriding=true
+spring.profiles.active=@spring.profiles.active@
\ No newline at end of file
diff --git a/custos-integration-services/user-management-service-parent/user-management-service/src/main/resources/bootstrap.properties b/custos-integration-services/user-management-service-parent/user-management-service/src/main/resources/bootstrap.properties
index 4b7ed78c3..5ba4b1d58 100644
--- a/custos-integration-services/user-management-service-parent/user-management-service/src/main/resources/bootstrap.properties
+++ b/custos-integration-services/user-management-service-parent/user-management-service/src/main/resources/bootstrap.properties
@@ -19,4 +19,4 @@
 
 spring.cloud.config.uri=http://custos-configuration-service.custos.svc.cluster.local:9000
 #spring.cloud.config.uri=http://localhost:9000
-spring.profiles.active:default
+spring.profiles.active=@spring.profiles.active@
diff --git a/custos-samples/configs/settings.ini b/custos-samples/configs/settings.ini
new file mode 100644
index 000000000..f6289bfbd
--- /dev/null
+++ b/custos-samples/configs/settings.ini
@@ -0,0 +1,8 @@
+[CustosServer]
+SERVER_HOST = custos.scigap.org
+SERVER_SSL_PORT = 31499
+;CLIENT_ID = 
+;CLIENT_SEC = 
+
+CLIENT_ID = 
+CLIENT_SEC = 
diff --git a/custos-samples/samples/__init__.py b/custos-samples/samples/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/custos-samples/samples/group_management_samples.py b/custos-samples/samples/group_management_samples.py
new file mode 100644
index 000000000..a0082ee65
--- /dev/null
+++ b/custos-samples/samples/group_management_samples.py
@@ -0,0 +1,58 @@
+import os
+
+from custos.clients.group_management_client import GroupManagementClient
+
+from custos.transport.settings import CustosServerClientSettings
+import custos.clients.utils.utilities as utl
+
+# load root directoty
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+
+# get settings file path (settings file path reside in configs folder under home directory)
+settings_path = os.path.join(BASE_DIR, 'configs', "settings.ini")
+
+# read settings
+custos_settings = CustosServerClientSettings(configuration_file_location=settings_path)
+
+# create custos user management client
+group_management_client = GroupManagementClient(custos_settings)
+
+# obtain base 64 encoded token for tenant
+b64_encoded_custos_token = utl.get_token(custos_settings=custos_settings)
+
+
+def create_group(name, description, owner_id):
+    response = group_management_client.create_groups(token=b64_encoded_custos_token, name=name,
+                                                     description=description,
+                                                     owner_id=owner_id)
+    print(response)
+    return response
+
+
+def add_user_to_group(username, group_id, membership_type):
+    response = group_management_client.add_user_to_group(token=b64_encoded_custos_token,
+                                                         username=username,
+                                                         group_id=group_id,
+                                                         membership_type=membership_type)
+    print(response)
+
+
+def add_child_group_to_parent_group(parent_group_id, child_group_id):
+    response = group_management_client.add_child_group(token=b64_encoded_custos_token, parent_group_id=parent_group_id,
+                                                       child_group_id=child_group_id)
+    print(response)
+
+
+def remove_child_group(parent_group_id, child_group_id):
+    response = group_management_client.add_child_group(token=b64_encoded_custos_token, parent_group_id=parent_group_id,
+                                                       child_group_id=child_group_id)
+    print(response)
+
+
+create_group("Group A", "Paren group", "TestUser4")
+create_group("Group B", "Child group", "TestUser4")
+
+add_user_to_group("Testuser5", "602336d5-e193-41ac-bde6-eb36a73f687e", "Member")
+
+add_child_group_to_parent_group("8b0f8241-e995-496e-a4f5-bdbde4235215", "602336d5-e193-41ac-bde6-eb36a73f687e")
+remove_child_group("8b0f8241-e995-496e-a4f5-bdbde4235215", "602336d5-e193-41ac-bde6-eb36a73f687e")
diff --git a/custos-samples/samples/identity_management_samples.py b/custos-samples/samples/identity_management_samples.py
new file mode 100644
index 000000000..d135f57d3
--- /dev/null
+++ b/custos-samples/samples/identity_management_samples.py
@@ -0,0 +1,40 @@
+import os
+
+from custos.clients.identity_management_client import IdentityManagementClient
+
+from custos.transport.settings import CustosServerClientSettings
+import custos.clients.utils.utilities as utl
+
+# load APIServerClient with default configuration
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+
+settings_path = os.path.join(BASE_DIR, 'configs', "settings.ini")
+
+# logger.info(settings_path)
+custos_settings = CustosServerClientSettings(configuration_file_location=settings_path)
+
+id_client = IdentityManagementClient(custos_settings)
+
+b64_encoded_custos_token = utl.get_token(custos_settings=custos_settings)
+
+
+def login(username, password):
+    resp = id_client.authenticate(token=b64_encoded_custos_token, username=username, password=password)
+    print(resp)
+
+
+def obtain_access_token_from_code(redirect_uri, code):
+    resp = id_client.token(token=b64_encoded_custos_token, redirect_uri=redirect_uri, code=code,
+                           grant_type="authorization_code")
+    print(resp)
+
+
+def get_oidc_configuration(client_id):
+    response = id_client.get_oidc_configuration(token=b64_encoded_custos_token, client_id=client_id)
+    print(response)
+
+
+def logout(refresh_token):
+    response = id_client.end_user_session(token=b64_encoded_custos_token, refresh_token=refresh_token)
+    print(response)
+
diff --git a/custos-samples/samples/secret_management_samples.py b/custos-samples/samples/secret_management_samples.py
new file mode 100644
index 000000000..229a6a42d
--- /dev/null
+++ b/custos-samples/samples/secret_management_samples.py
@@ -0,0 +1,62 @@
+import os
+
+from custos.clients.resource_secret_management_client import ResourceSecretManagementClient
+
+from custos.transport.settings import CustosServerClientSettings
+import custos.clients.utils.utilities as utl
+
+# load root directoty
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+
+# get settings file path (settings file path reside in configs folder under home directory)
+settings_path = os.path.join(BASE_DIR, 'configs', "settings.ini")
+
+# read settings
+custos_settings = CustosServerClientSettings(configuration_file_location=settings_path)
+
+# create custos user management client
+resource_management_client = ResourceSecretManagementClient(custos_settings)
+
+# obtain base 64 encoded token for tenant
+b64_encoded_custos_token = utl.get_token(custos_settings=custos_settings)
+
+
+def generateSSH_key(owner_id, description):
+    response = resource_management_client.add_ssh_credential(token=b64_encoded_custos_token,
+                                                             client_id=custos_settings.CUSTOS_CLIENT_ID,
+                                                             owner_id=owner_id,
+                                                             description=description)
+    print(response)
+    return response
+
+
+def getSSHKey(ssh_credential_token):
+    response = resource_management_client.get_ssh_credential(token=b64_encoded_custos_token,
+                                                             client_id=custos_settings.CUSTOS_CLIENT_ID,
+                                                             ssh_credential_token=ssh_credential_token)
+    print(response)
+    return response
+
+
+def addPasswordCredential(owner_id, description, password):
+    response = resource_management_client.add_password_credential(token=b64_encoded_custos_token,
+                                                                  client_id=custos_settings.CUSTOS_CLIENT_ID,
+                                                                  owner_id=owner_id,
+                                                                  description=description,
+                                                                  password=password)
+    print(response)
+    return response
+
+
+def getPasswordCredential(password_credential_token):
+    response = resource_management_client.get_password_credential(token=b64_encoded_custos_token,
+                                                                  client_id=custos_settings.CUSTOS_CLIENT_ID,
+                                                                  password_credential_token=password_credential_token)
+    print(response)
+    return response
+
+
+generateSSH_key("TestUser5", "My Gateway SSH Key")
+addPasswordCredential("TestUser5", "My admin password", "asaxsxasxasx")
+getSSHKey("655e8845-9afa-4251-bb0e-c1eb42bec2fc")
+getPasswordCredential("a575726a-3e2a-41d1-ad08-06a97dbae903")
diff --git a/custos-samples/samples/secure_resources_with_custos_simulation.py b/custos-samples/samples/secure_resources_with_custos_simulation.py
new file mode 100644
index 000000000..7877a4369
--- /dev/null
+++ b/custos-samples/samples/secure_resources_with_custos_simulation.py
@@ -0,0 +1,361 @@
+import os
+import json
+
+from custos.clients.user_management_client import UserManagementClient
+from custos.clients.group_management_client import GroupManagementClient
+from custos.clients.resource_secret_management_client import ResourceSecretManagementClient
+from custos.clients.sharing_management_client import SharingManagementClient
+
+from custos.transport.settings import CustosServerClientSettings
+import custos.clients.utils.utilities as utl
+
+from google.protobuf.json_format import MessageToJson
+
+# load root directoty
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+
+# get settings file path (settings file path reside in configs folder under home directory)
+settings_path = os.path.join(BASE_DIR, 'configs', "settings.ini")
+
+# read settings
+custos_settings = CustosServerClientSettings(configuration_file_location=settings_path)
+
+# create custos user management client
+user_management_client = UserManagementClient(custos_settings)
+
+# create custos group management client
+group_management_client = GroupManagementClient(custos_settings)
+
+# create custos resource secret client
+resource_secret_client = ResourceSecretManagementClient(custos_settings)
+
+# create sharing management client
+sharing_management_client = SharingManagementClient(custos_settings)
+
+# obtain base 64 encoded token for tenant
+b64_encoded_custos_token = utl.get_token(custos_settings=custos_settings)
+
+owner_id = "admin"
+
+created_groups = {}
+
+resource_ids = []
+
+
+def verifiy_admin_user():
+    response = user_management_client.get_user(token=b64_encoded_custos_token, username=owner_id)
+    user_management_client.update_user_profile(
+        token=b64_encoded_custos_token,
+        username=response.username,
+        email=response.email,
+        first_name=response.first_name,
+        last_name=response.last_name)
+
+
+def register_users(users):
+    for user in users:
+        print("Registering user: " + user['username'])
+        user_management_client.register_user(token=b64_encoded_custos_token,
+                                             username=user['username'],
+                                             first_name=user['first_name'],
+                                             last_name=user['last_name'],
+                                             password=user['password'],
+                                             email=user['email'],
+                                             is_temp_password=False)
+
+        user_management_client.enable_user(token=b64_encoded_custos_token, username=user['username'])
+
+
+def create_groups(groups):
+    for group in groups:
+        print("Creating group: " + group['name'])
+        grResponse = group_management_client.create_groups(token=b64_encoded_custos_token,
+                                                           name=group['name'],
+                                                           description=group['description'],
+                                                           owner_id=group['owner_id'])
+        resp = MessageToJson(grResponse)
+        respData = json.loads(resp)
+        created_groups[respData['groups'][0]['name']] = respData['groups'][0]['id']
+
+
+def allocate_users_to_groups(user_group_mapping):
+    for usr_map in user_group_mapping:
+        group_id = created_groups[usr_map['group_name']]
+        print("Assigning user " + usr_map['username'] + " to group " + usr_map['group_name'])
+        group_management_client.add_user_to_group(token=b64_encoded_custos_token,
+                                                  username=usr_map['username'],
+                                                  group_id=group_id,
+                                                  membership_type='Member'
+                                                  )
+
+
+def allocate_child_group_to_parent_group(gr_gr_mapping):
+    for gr_map in gr_gr_mapping:
+        child_id = created_groups[gr_map['child_name']]
+        parent_id = created_groups[gr_map['parent_name']]
+        print("Assigning child group " + gr_map['child_name'] + " to parent group " + gr_map['parent_name'])
+        group_management_client.add_child_group(token=b64_encoded_custos_token,
+                                                parent_group_id=parent_id,
+                                                child_group_id=child_id)
+
+
+def create_resource():
+    response = resource_secret_client.add_ssh_credential(
+        token=b64_encoded_custos_token,
+        client_id=custos_settings.CUSTOS_CLIENT_ID,
+        owner_id='admin',
+        description='Testing SSH Key')
+    resource_ids.append(response.token)
+
+
+def create_permissions(permissions):
+    for perm in permissions:
+        print("Creating permission " + perm['id'])
+        sharing_management_client.create_permission_type(token=b64_encoded_custos_token,
+                                                         client_id=custos_settings.CUSTOS_CLIENT_ID,
+                                                         id=perm['id'],
+                                                         name=perm['name'],
+                                                         description=perm['description'])
+
+
+def create_entity_types(entity_types):
+    for type in entity_types:
+        print("Creating entity types " + type['id'])
+        sharing_management_client.create_entity_type(token=b64_encoded_custos_token,
+                                                     client_id=custos_settings.CUSTOS_CLIENT_ID,
+                                                     id=type['id'],
+                                                     name=type['name'],
+                                                     description=type['description'])
+
+
+def register_resources(resources):
+    for resource in resources:
+        print("Register resources " + resource['id'])
+        sharing_management_client.create_entity(token=b64_encoded_custos_token,
+                                                client_id=custos_settings.CUSTOS_CLIENT_ID,
+                                                id=resource['id'],
+                                                name=resource['name'],
+                                                description=resource['description'],
+                                                owner_id=resource['user_id'],
+                                                type=resource['type'],
+                                                parent_id='')
+
+
+def share_resource_with_user(sharings):
+    for shr in sharings:
+        print("Sharing entity " + shr['entity_id'] + " with user " + shr['user_id'] + " with permission " + shr[
+            'permission_type'])
+        sharing_management_client.share_entity_with_users(token=b64_encoded_custos_token,
+                                                          client_id=custos_settings.CUSTOS_CLIENT_ID,
+                                                          entity_id=shr['entity_id'],
+                                                          permission_type=shr['permission_type'],
+                                                          user_id=shr['user_id']
+                                                          )
+
+
+def share_resource_with_group(gr_sharings):
+    for shr in gr_sharings:
+        group_id = created_groups[shr['group_name']]
+        print("Sharing entity " + shr['entity_id'] + " with group " + shr['group_name'] + " with permission " + shr[
+            'permission_type'])
+        sharing_management_client.share_entity_with_groups(token=b64_encoded_custos_token,
+                                                           client_id=custos_settings.CUSTOS_CLIENT_ID,
+                                                           entity_id=shr['entity_id'],
+                                                           permission_type=shr['permission_type'],
+                                                           group_id=group_id)
+
+
+def check_user_permissions(users):
+    for user in users:
+        access = sharing_management_client.user_has_access(token=b64_encoded_custos_token,
+                                                           client_id=custos_settings.CUSTOS_CLIENT_ID,
+                                                           entity_id=resource_ids[0],
+                                                           permission_type="READ",
+                                                           user_id=user['username'])
+        usr = user['username']
+        print("Access for user " + usr + " : " + str(access))
+
+
+users = [
+    {
+        'username': 'UserA',
+        'first_name': 'Aaron',
+        'last_name': 'Bob',
+        'password': '1234',
+        'email': 'a@gmail.com'
+    },
+    {
+        'username': 'UserB',
+        'first_name': 'Baron',
+        'last_name': 'Bob',
+        'password': '1234',
+        'email': 'b@gmail.com'
+    },
+    {
+        'username': 'UserC',
+        'first_name': 'Caron',
+        'last_name': 'Bob',
+        'password': '1234',
+        'email': 'c@gmail.com'
+    },
+    {
+        'username': 'UserD',
+        'first_name': 'Daron',
+        'last_name': 'Bob',
+        'password': '1234',
+        'email': 'd@gmail.com'
+    },
+    {
+        'username': 'UserE',
+        'first_name': 'Earon',
+        'last_name': 'Bob',
+        'password': '1234',
+        'email': 'e@gmail.com'
+    },
+    {
+        'username': 'UserF',
+        'first_name': 'Faron',
+        'last_name': 'Bob',
+        'password': '1234',
+        'email': 'f@gmail.com'
+    }
+]
+
+groups = [
+    {
+        'name': 'groupA',
+        'description': 'Group L',
+        'owner_id': 'admin'
+    },
+    {
+        'name': 'groupB',
+        'description': 'Group B',
+        'owner_id': 'admin'
+    },
+    {
+        'name': 'groupC',
+        'description': 'Group C',
+        'owner_id': 'admin'
+    }
+]
+
+user_group_mapping = [
+    {
+        'group_name': 'groupA',
+        'username': 'UserA'
+    },
+    {
+        'group_name': 'groupA',
+        'username': 'UserB'
+    },
+    {
+        'group_name': 'groupB',
+        'username': 'UserC'
+    },
+    {
+        'group_name': 'groupB',
+        'username': 'UserD'
+    },
+    {
+        'group_name': 'groupC',
+        'username': 'UserE'
+    },
+    {
+        'group_name': 'groupC',
+        'username': 'UserF'
+    }
+]
+
+child_gr_parent_gr_mapping = [
+    {
+        "child_name": "groupB",
+        "parent_name": "groupA"
+    }
+]
+
+permissions = [
+    {
+        'id': 'OWNER',
+        'name': 'OWNER',
+        'description': 'Owner permission'
+    },
+    {
+        'id': 'READ',
+        'name': 'READ',
+        'description': 'Read permission'
+    },
+    {
+        'id': 'WRITE',
+        'name': 'WRITE',
+        'description': 'WRITE permission'
+    }
+]
+entity_types = [
+    {
+        'id': 'SECRET',
+        'name': 'SECRET',
+        'description': 'SECRET Keys'
+    }
+]
+
+verifiy_admin_user()
+
+# Register users
+register_users(users)
+
+# Create groups
+create_groups(groups)
+
+# Allocate users to groups
+allocate_users_to_groups(user_group_mapping)
+
+# Allocate child groups to parent group
+allocate_child_group_to_parent_group(child_gr_parent_gr_mapping)
+
+# Creare resource
+create_resource()
+
+# Create permissions
+create_permissions(permissions)
+
+# Create entity types
+create_entity_types(entity_types)
+
+resources = [
+    {
+        'id': resource_ids[0],
+        'name': 'SECRET',
+        'description': 'Register SSH Key Id',
+        'user_id': 'admin',
+        'type': 'SECRET'
+    }
+]
+
+sharings = [
+    {
+        "entity_id": resource_ids[0],
+        "permission_type": "READ",
+        "type": "SECRET",
+        "user_id": "UserF"
+    }
+]
+
+gr_sharings = [{
+
+    "entity_id": resource_ids[0],
+    "permission_type": "READ",
+    "type": "SSH_KEY",
+    "group_name": 'groupA'
+}]
+
+# Register resources
+register_resources(resources)
+
+# Share resource with users
+share_resource_with_user(sharings)
+
+# Share resource with group
+share_resource_with_group(gr_sharings)
+
+# Check user permissions
+check_user_permissions(users)
diff --git a/custos-samples/samples/sharing_management_samples.py b/custos-samples/samples/sharing_management_samples.py
new file mode 100644
index 000000000..d94eeae41
--- /dev/null
+++ b/custos-samples/samples/sharing_management_samples.py
@@ -0,0 +1,89 @@
+import os
+
+from custos.clients.sharing_management_client import SharingManagementClient
+
+from custos.transport.settings import CustosServerClientSettings
+import custos.clients.utils.utilities as utl
+
+# load root directoty
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+
+# get settings file path (settings file path reside in configs folder under home directory)
+settings_path = os.path.join(BASE_DIR, 'configs', "settings.ini")
+
+# read settings
+custos_settings = CustosServerClientSettings(configuration_file_location=settings_path)
+
+# create custos user management client
+sharing_management_client = SharingManagementClient(custos_settings)
+
+# obtain base 64 encoded token for tenant
+b64_encoded_custos_token = utl.get_token(custos_settings=custos_settings)
+
+
+def create_permission_type(id, name, description):
+    response = sharing_management_client.create_permission_type(token=b64_encoded_custos_token,
+                                                                client_id=custos_settings.CUSTOS_CLIENT_ID,
+                                                                id=id,
+                                                                name=name,
+                                                                description=description)
+    print(response)
+
+
+def create_entity_type(id, name, description):
+    response = sharing_management_client.create_entity_type(token=b64_encoded_custos_token,
+                                                            client_id=custos_settings.CUSTOS_CLIENT_ID,
+                                                            id=id,
+                                                            name=name,
+                                                            description=description)
+    print(response)
+
+
+def create_entity(id, name, description, owner_id, type):
+    response = sharing_management_client.create_entity(token=b64_encoded_custos_token,
+                                                       client_id=custos_settings.CUSTOS_CLIENT_ID,
+                                                       id=id,
+                                                       name=name,
+                                                       description=description,
+                                                       owner_id=owner_id,
+                                                       type=type,
+                                                       parent_id='')
+    print(response)
+
+
+def share_entity_with_user(entity_id, permission_type, user_id):
+    response = sharing_management_client.share_entity_with_users(token=b64_encoded_custos_token,
+                                                                 client_id=custos_settings.CUSTOS_CLIENT_ID,
+                                                                 entity_id=entity_id,
+                                                                 permission_type=permission_type,
+                                                                 user_id=user_id)
+    print(response)
+
+
+def share_entity_with_group(entity_id, permission_type, group_id):
+    response = sharing_management_client.share_entity_with_groups(token=b64_encoded_custos_token,
+                                                                  client_id=custos_settings.CUSTOS_CLIENT_ID,
+                                                                  entity_id=entity_id,
+                                                                  permission_type=permission_type,
+                                                                  group_id=group_id)
+    print(response)
+
+
+def check_user_has_access(entity_id, permission_type, user_id):
+    response = sharing_management_client.user_has_access(token=b64_encoded_custos_token,
+                                                         client_id=custos_settings.CUSTOS_CLIENT_ID,
+                                                         entity_id=entity_id,
+                                                         permission_type=permission_type,
+                                                         user_id=user_id)
+    print(response)
+
+
+# create_permission_type('RW', 'Read and Write', 'Read write permissions')
+# create_entity_type("CRED_TOKEN", "Credential Token", "This is credential token")
+
+create_entity('655e8845-9afa-4251-bb0e-c1ebasasx42bec2fcASD', 'Password Token', 'This is password token', 'TestUser5',
+              'CRED_TOKEN')
+# share_entity_with_user('655e8845-9afa-4251-bb0e-c1eb42bec2fc', 'RW', 'TestUser4')
+# share_entity_with_group('655e8845-9afa-4251-bb0e-c1eb42bec2fc', 'RW', '602336d5-e193-41ac-bde6-eb36a73f687e')
+#
+# check_user_has_access('655e8845-9afa-4251-bb0e-c1eb42bec2fc', 'RW', 'TestUser4')
diff --git a/custos-samples/samples/user_management_samples.py b/custos-samples/samples/user_management_samples.py
new file mode 100644
index 000000000..6b0b489eb
--- /dev/null
+++ b/custos-samples/samples/user_management_samples.py
@@ -0,0 +1,66 @@
+import os
+
+from custos.clients.user_management_client import UserManagementClient
+
+from custos.transport.settings import CustosServerClientSettings
+import custos.clients.utils.utilities as utl
+
+# load root directoty
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+
+#get settings file path (settings file path reside in configs folder under home directory)
+settings_path = os.path.join(BASE_DIR, 'configs', "settings.ini")
+
+# read settings
+custos_settings = CustosServerClientSettings(configuration_file_location=settings_path)
+
+# create custos user management client
+user_management_client = UserManagementClient(custos_settings)
+
+# obtain base 64 encoded token for tenant
+b64_encoded_custos_token = utl.get_token(custos_settings=custos_settings)
+
+
+def register_user():
+    response = user_management_client.register_user(token=b64_encoded_custos_token,
+                                                    username="TestUser5",
+                                                    first_name="Watson",
+                                                    last_name="Christe",
+                                                    password="1234",
+                                                    email="wat@gmail.com",
+                                                    is_temp_password=False)
+    print(response)
+
+
+def enable_user():
+    response = user_management_client.enable_user(token=b64_encoded_custos_token,
+                                                  username="TestUser5")
+    print(response)
+
+
+def get_user():
+    response = user_management_client.get_user(token=b64_encoded_custos_token,
+                                               username="TestUser5")
+    print(response)
+
+
+def update_user():
+    response = user_management_client.update_user_profile(token=b64_encoded_custos_token,
+                                                          username="TestUser5",
+                                                          first_name="Jimmy",
+                                                          last_name="Jhon",
+                                                          email="wat@gmail.com")
+    print(response)
+
+
+def find_users():
+    response = user_management_client.find_users(token=b64_encoded_custos_token, offset=0, limit=1,
+                                                 username="TestUser5")
+    print(response)
+
+
+register_user()
+enable_user()
+get_user()
+update_user()
+find_users()
diff --git a/pom.xml b/pom.xml
index 3c94d9313..600ce7027 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
     <groupId>org.apache.custos</groupId>
     <artifactId>custos</artifactId>
     <packaging>pom</packaging>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.1-SNAPSHOT</version>
 
     <modules>
         <module>custos-core-services</module>
@@ -299,19 +299,35 @@
                             <release>${java.version}</release>
                         </configuration>
                     </plugin>
-                    <!--                    <plugin>-->
-                    <!--                        <groupId>org.springframework.boot</groupId>-->
-                    <!--                        <artifactId>spring-boot-maven-plugin</artifactId>-->
-                    <!--                        <version>${spring.boot.version}</version>-->
-                    <!--                        <executions>-->
-                    <!--                            <execution>-->
-                    <!--                                <id>default</id>-->
-                    <!--                                <goals>-->
-                    <!--                                    <goal>repackage</goal>-->
-                    <!--                                </goals>-->
-                    <!--                            </execution>-->
-                    <!--                        </executions>-->
-                    <!--                    </plugin>-->
+                    <plugin>
+                        <artifactId>maven-resources-plugin</artifactId>
+                        <version>3.0.2</version>
+                        <executions>
+                            <execution>
+                                <id>copy-resources</id>
+                                <!-- here the phase you need -->
+                                <phase>install</phase>
+                                <goals>
+                                    <goal>copy-resources</goal>
+                                </goals>
+                                <configuration>
+                                    <outputDirectory>
+                                        /Users/isururanawaka/Documents/Airavata_Repository/airavata-custos/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos
+                                    </outputDirectory>   <!-- output directory -->
+                                    <resources>
+                                        <resource>
+                                            <directory>${basedir}/src/main/proto
+                                            </directory>         <!-- source directory -->
+                                            <includes>
+                                                <include>**/*.proto</include>
+                                            </includes>
+                                            <filtering>true</filtering>
+                                        </resource>
+                                    </resources>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
                     <plugin>
                         <groupId>org.xolstice.maven.plugins</groupId>
                         <artifactId>protobuf-maven-plugin</artifactId>
@@ -337,7 +353,42 @@
         </profile>
         <profile>
             <id>container</id>
+            <properties>
+                <spring.profiles.active>dev</spring.profiles.active>
+                <vault.token>{token}</vault.token>
+                <vault.scheme>https</vault.scheme>
+                <vault.host>vault.custos.scigap.org</vault.host>
+                <vault.port>31190</vault.port>
+                <vault.uri>https://vault.custos.scigap.org:31190</vault.uri>
+                <iam.dev.username>{token}</iam.dev.username>
+                <iam.dev.password>{token}</iam.dev.password>
+                <iam.staging.username>admin</iam.staging.username>
+                <iam.staging.password>{token}</iam.staging.password>
+                <cilogon.dev.id>{token}</cilogon.dev.id>
+                <cilogon.dev.sec>{token}</cilogon.dev.sec>
+                <cilogon.staging.id>{token}</cilogon.staging.id>
+                <cilogon.staging.sec>{token}</cilogon.staging.sec>
+                <custos.email.password>{token}</custos.email.password>
+
+            </properties>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
             <build>
+                <resources>
+                    <resource>
+                        <directory>src/main/resources</directory>
+                        <filtering>true</filtering>
+<!--                        <excludes>-->
+<!--                            <exclude>vault-client-truststore.pkcs12</exclude>-->
+<!--                            <exclude>keycloak-client-truststore.pkcs12</exclude>-->
+<!--                        </excludes>-->
+                        <includes>
+                            <include>**/*.pcks12</include>
+                            <include>**/*.properties</include>
+                        </includes>
+                    </resource>
+                </resources>
                 <plugins>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
@@ -419,6 +470,9 @@
                         <configuration>
                             <chartName>${project.artifactId}</chartName>
                             <chartFolder>src/main/helm</chartFolder>
+                            <chartRepoUrl>https://charts.helm.sh/stable</chartRepoUrl>
+                            <!--                            <chartRepoUrl>https://kubernetes.oss-cn-hangzhou.aliyuncs.com/charts</chartRepoUrl>-->
+                            <helmVersion>3.4.2</helmVersion>
                             <!--                            <chartRepoUrl>null</chartRepoUrl>-->
                             <chartRepoUrl>https://kubernetes.oss-cn-hangzhou.aliyuncs.com/charts</chartRepoUrl>
                             <helmVersion>2.16.0</helmVersion>
@@ -438,36 +492,66 @@
                             </execution>
                         </executions>
                     </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>scp-to-remote</id>
+            <build>
+                <plugins>
                     <plugin>
-                        <artifactId>maven-resources-plugin</artifactId>
-                        <version>3.0.2</version>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <version>1.8</version>
                         <executions>
                             <execution>
-                                <id>copy-resources</id>
-                                <!-- here the phase you need -->
-                                <phase>install</phase>
                                 <goals>
-                                    <goal>copy-resources</goal>
+                                    <goal>run</goal>
                                 </goals>
-                                <configuration>
-                                    <outputDirectory>
-                                        /Users/isururanawaka/Documents/Airavata_Repository/airavata-custos/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos
-                                    </outputDirectory>   <!-- output directory -->
-                                    <resources>
-                                        <resource>
-                                            <directory>${basedir}/src/main/proto
-                                            </directory>         <!-- source directory -->
-                                            <includes>
-                                                <include>**/*.proto</include>
-                                            </includes>
-                                            <filtering>true</filtering>
-                                        </resource>
-                                    </resources>
-                                </configuration>
                             </execution>
                         </executions>
+                        <dependencies>
+                            <dependency>
+                                <groupId>ant</groupId>
+                                <artifactId>ant-commons-net</artifactId>
+                                <version>1.6.5</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>org.apache.ant</groupId>
+                                <artifactId>ant-jsch</artifactId>
+                                <version>1.10.9</version>
+                            </dependency>
+                        </dependencies>
+                        <configuration>
+                            <target>
+
+                                <scp localFile="${project.basedir}/target/helm/${project.artifactId}-${project.version}.tgz"
+                                     remoteToFile="ubuntu@${host}:/home/ubuntu/custos/artifacts"
+                                     verbose="true"
+                                     keyfile="${ssh.privatekey}"
+                                     passphrase="${ssh.passphrase}" trust="true">
+                                </scp>
+                                <sshexec host="${host}"
+                                         username="ubuntu"
+                                         keyfile="${ssh.privatekey}"
+                                         passphrase="${ssh.passphrase}" trust="true"
+                                         command="helm delete --purge ${project.artifactId} "/>
+
+                                <sshexec host="${host}"
+                                         username="ubuntu"
+                                         keyfile="${ssh.privatekey}"
+                                         passphrase="${ssh.passphrase}" trust="true"
+                                         command="helm install --name ${project.artifactId} /home/ubuntu/custos/artifacts/${project.artifactId}-${project.version}.tgz  --namespace custos"/>
+
+                                <!-- SSH -->
+                                <taskdef name="sshexec"
+                                         classname="org.apache.tools.ant.taskdefs.optional.ssh.SSHExec"
+                                         classpathref="maven.plugin.classpath" />
+
+                            </target>
+                            <skip>true</skip>
+                        </configuration>
                     </plugin>
-
                 </plugins>
             </build>
         </profile>
@@ -522,6 +606,7 @@
                 <version>${os.maven.plugin}</version>
             </extension>
         </extensions>
+
     </build>
 
     <properties>
@@ -565,7 +650,7 @@
         <mysql.connector.java>8.0.18</mysql.connector.java>
         <javax.persistance>1.0.2</javax.persistance>
 
-        <keycloak.admin.version>7.0.0</keycloak.admin.version>
+        <keycloak.admin.version>9.0.2</keycloak.admin.version>
 
         <reasteasy.client.version>3.0.14.Final</reasteasy.client.version>
 
@@ -592,6 +677,12 @@
 
         <com.codahale.version>0.7.0</com.codahale.version>
 
+<!--        <host>service.staging.usecustos.org</host>-->
+        <host>custos.scigap.org</host>
+
+        <ssh.privatekey>/Users/isururanawaka/.ssh/custos/id_rsa</ssh.privatekey>
+
+        <ssh.passphrase>isjarana</ssh.passphrase>
         <dozer.version>5.5.1</dozer.version>
 
         <kafka-clients.version>1.0.0</kafka-clients.version>


Test patch:
diff --git a/custos-tests/pom.xml b/custos-tests/pom.xml
index df8835107..a3d756b01 100644
--- a/custos-tests/pom.xml
+++ b/custos-tests/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>custos</artifactId>
         <groupId>org.apache.custos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>