diff --git a/environments/kind/values.yaml b/environments/kind/values.yaml
index 0417047003b921a6de01451ab83bf272c7adf73e..0f04784d15f207c9d23ef8b135b4b2fafa873682 100644
--- a/environments/kind/values.yaml
+++ b/environments/kind/values.yaml
@@ -22,6 +22,8 @@ srm:
       type: NodePort
       nodePort: 32415
     image:
+      repository: labs.etsi.org:5050/oop/code/service-resource-manager
+      tag: "1.1"
       pullPolicy: IfNotPresent
     env:
       networkAdapterName: "oai"
@@ -49,6 +51,8 @@ oeg:
       type: NodePort
       nodePort: 32263
     image:
+      repository: labs.etsi.org:5050/oop/code/open-exposure-gateway
+      tag: "1.1"
       pullPolicy: IfNotPresent
 
 federationManager:
@@ -62,7 +66,12 @@ federationManager:
       type: NodePort
       nodePort: 30989
     image:
+      repository: labs.etsi.org:5050/oop/code/federation-manager
+      tag: "1.1"
       pullPolicy: IfNotPresent
+    env:
+      federationManagerHost: "http://federation-manager.oop.svc.cluster.local:8989/operatorplatform/federation/v1"
+      tokenEndpoint: "http://keycloak.oop.svc.cluster.local:8080/realms/federation/protocol/openid-connect/token"
 
   mongodb:
     persistence:
diff --git a/oop-platform-chart/charts/federation-manager/templates/federation-manager-configmap.yaml b/oop-platform-chart/charts/federation-manager/templates/federation-manager-configmap.yaml
index f0e2e54d5e069c69437bd2da7ca22dc959564ca0..eed42c1e2456e413bfb017f230348579065554ed 100644
--- a/oop-platform-chart/charts/federation-manager/templates/federation-manager-configmap.yaml
+++ b/oop-platform-chart/charts/federation-manager/templates/federation-manager-configmap.yaml
@@ -43,6 +43,11 @@ data:
     client_name = {{ .Values.federationManager.config.edgeCloudPlatform.client_name }}
     flavour_id = {{ .Values.federationManager.config.edgeCloudPlatform.flavour_id }}
 
+    [service_resource_manager]
+    host = {{ .Values.federationManager.config.serviceResourceManager.host }}
+    port = {{ .Values.federationManager.config.serviceResourceManager.port }}
+    server = {{ .Values.federationManager.config.serviceResourceManager.server }}
+
     [artefact_manager]
     host = {{ .Values.federationManager.config.artefactManager.host }}
     port = {{ .Values.federationManager.config.artefactManager.port }}
diff --git a/oop-platform-chart/charts/federation-manager/templates/federation-manager-deployment.yaml b/oop-platform-chart/charts/federation-manager/templates/federation-manager-deployment.yaml
index 8eaa7113dddf75e4a6fdc4472f5026010647dc5a..af9fd05db841d87adafc0279c25e940b78e32feb 100644
--- a/oop-platform-chart/charts/federation-manager/templates/federation-manager-deployment.yaml
+++ b/oop-platform-chart/charts/federation-manager/templates/federation-manager-deployment.yaml
@@ -56,36 +56,13 @@ spec:
 
       containers:
 
-        #####################################################################
-        # 1) KEYCLOAK CONTAINER  (runs INSIDE the federation-manager pod)
-        #####################################################################
-        - name: keycloak
-          image: "{{ .Values.keycloak.image.repository }}:{{ .Values.keycloak.image.tag }}"
-          imagePullPolicy: {{ .Values.keycloak.image.pullPolicy }}
-          args:
-            - start-dev
-            - --import-realm
-          env:
-            - name: KC_BOOTSTRAP_ADMIN_USERNAME
-              value: {{ .Values.keycloak.admin.username | quote }}
-            - name: KC_BOOTSTRAP_ADMIN_PASSWORD
-              value: {{ .Values.keycloak.admin.password | quote }}
-            - name: KC_IMPORT
-              value: /opt/keycloak/data/import/realm-import.json
-          ports:
-            - name: keycloak-http
-              containerPort: 8080
-              protocol: TCP
-          volumeMounts:
-            - name: realm-import
-              mountPath: /opt/keycloak/data/import/
 
-        #####################################################################
-        # 2) FEDERATION MANAGER MAIN CONTAINER
-        #####################################################################
         - name: federation-manager
           image: "{{ .Values.federationManager.image.repository }}:{{ .Values.federationManager.image.tag }}"
           imagePullPolicy: {{ .Values.federationManager.image.pullPolicy }}
+          env:
+            - name: FM_CONFIG_FILE
+              value: /usr/app/src/conf/config.cfg
           ports:
             - name: http
               containerPort: {{ .Values.federationManager.service.targetPort }}
@@ -97,9 +74,6 @@ spec:
           resources:
             {{- toYaml .Values.federationManager.resources | nindent 12 }}
 
-        #####################################################################
-        # 3) OPENVPN SIDECAR CONTAINER
-        #####################################################################
         {{- if .Values.openvpn.enabled }}
         - name: openvpn
           image: "{{ .Values.openvpn.image.repository }}:{{ .Values.openvpn.image.tag }}"
@@ -144,9 +118,6 @@ spec:
                 - NET_ADMIN
         {{- end }}
 
-      #######################################################################
-      # VOLUME DEFINITIONS
-      #######################################################################
       volumes:
         - name: config
           emptyDir: {}
@@ -161,11 +132,6 @@ spec:
             secretName: federation-manager-secrets
             defaultMode: 420
 
-        # Keycloak realm import ConfigMap
-        - name: realm-import
-          configMap:
-            name: keycloak-config
-
         {{- if .Values.openvpn.enabled }}
         - name: ovpn
           secret:
diff --git a/oop-platform-chart/charts/federation-manager/values.yaml b/oop-platform-chart/charts/federation-manager/values.yaml
index d367c72f9cde25b3bb4efc90f186a9fda76fe02a..6412747d56f501722c3e7ed715dc8d55707d426c 100644
--- a/oop-platform-chart/charts/federation-manager/values.yaml
+++ b/oop-platform-chart/charts/federation-manager/values.yaml
@@ -102,8 +102,8 @@ federationManager:
 
   image:
     repository: labs.etsi.org:5050/oop/code/federation-manager
-    tag: "1.0.0"
-    pullPolicy: IfNotPresent
+    tag: "1.1"
+    pullPolicy: Always
 
   service:
     name: federation-manager
@@ -145,10 +145,15 @@ federationManager:
       client_name: "lite2edge"
       flavour_id: "default"
 
+    serviceResourceManager:
+      host: "srm"
+      port: "8080"
+      server: "/srm/1.0.0"
+
     artefactManager:
       host: "artefact-manager-service.oop.svc.cluster.local"
       port: "8000"
-      enabled: "true"
+      enabled: "false"
       dst_registry: ""
       dst_username: ""
       dst_password: ""
diff --git a/oop-platform-chart/charts/oeg/values.yaml b/oop-platform-chart/charts/oeg/values.yaml
index bea2440377d3d07275847c1f63e5f7c4fe1d9edf..67117cfd937fe83a8b3217343a8088050594ac95 100644
--- a/oop-platform-chart/charts/oeg/values.yaml
+++ b/oop-platform-chart/charts/oeg/values.yaml
@@ -38,8 +38,8 @@ oegcontroller:
   
   image:
     repository: labs.etsi.org:5050/oop/code/open-exposure-gateway
-    tag: 1.0.0
-    pullPolicy: IfNotPresent
+    tag: "1.1"
+    pullPolicy: Always
   
   service:
     name: oeg
@@ -55,7 +55,7 @@ oegcontroller:
     srmHost: "http://srm:8080/srm/1.0.0"
     federationManagerHost: "http://federation-manager.oop.svc.cluster.local:8989/operatorplatform/federation/v1"
     partnerApiRoot: "http://10.8.0.1:31002"
-    tokenEndpoint: "http://federation-manager.oop.svc.cluster.local:8080/realms/federation/protocol/openid-connect/token"
+    tokenEndpoint: "http://keycloak.oop.svc.cluster.local:8080/realms/federation/protocol/openid-connect/token"
     availZoneNotifLink: ""
 
 # Ingress configuration
diff --git a/oop-platform-chart/charts/srm/values.yaml b/oop-platform-chart/charts/srm/values.yaml
index e4e8473c049ec8c39ce4c6d176faccf4d10fa2e4..9471a42c85b9ad850eaf876a48a44c0e194fa239 100644
--- a/oop-platform-chart/charts/srm/values.yaml
+++ b/oop-platform-chart/charts/srm/values.yaml
@@ -37,8 +37,8 @@ srmcontroller:
   
   image:
     repository: labs.etsi.org:5050/oop/code/service-resource-manager
-    tag: 1.0.0
-    pullPolicy: IfNotPresent
+    tag: "1.1"
+    pullPolicy: Always
   
   service:
     name: srm
diff --git a/oop-platform-chart/values.yaml b/oop-platform-chart/values.yaml
index c529918cdb2728c1f26ed87ccc33086f9af7b630..bbf6f28edf4e755f3303c775153ca6caee18e5ba 100644
--- a/oop-platform-chart/values.yaml
+++ b/oop-platform-chart/values.yaml
@@ -43,8 +43,8 @@ srm:
     replicaCount: 1
     image:
       repository: labs.etsi.org:5050/oop/code/service-resource-manager
-      tag: 1.0.0
-      pullPolicy: IfNotPresent
+      tag: "1.1"
+      pullPolicy: Always
     service:
       name: srm
       type: ClusterIP
@@ -119,8 +119,8 @@ oeg:
     replicaCount: 1
     image:
       repository: labs.etsi.org:5050/oop/code/open-exposure-gateway
-      tag: 1.0.0
-      pullPolicy: IfNotPresent
+      tag: "1.1"
+      pullPolicy: Always
     service:
       name: oeg
       type: ClusterIP