diff --git a/environments/kind/values.yaml b/environments/kind/values.yaml
index 0417047003b921a6de01451ab83bf272c7adf73e..45c7e756b60a46388ad9eba8a66a0c0cbb24acc0 100644
--- a/environments/kind/values.yaml
+++ b/environments/kind/values.yaml
@@ -63,6 +63,9 @@ federationManager:
       nodePort: 30989
     image:
       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-deployment.yaml b/oop-platform-chart/charts/federation-manager/templates/federation-manager-deployment.yaml
index 8eaa7113dddf75e4a6fdc4472f5026010647dc5a..7e33ed5b775866264f0b9c657b729ddc2b151bb6 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,33 +56,7 @@ 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 }}
@@ -97,9 +71,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 +115,6 @@ spec:
                 - NET_ADMIN
         {{- end }}
 
-      #######################################################################
-      # VOLUME DEFINITIONS
-      #######################################################################
       volumes:
         - name: config
           emptyDir: {}
@@ -161,11 +129,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..4768b0ef0883aada0d99108a7d6342794597bd4a 100644
--- a/oop-platform-chart/charts/federation-manager/values.yaml
+++ b/oop-platform-chart/charts/federation-manager/values.yaml
@@ -148,7 +148,7 @@ federationManager:
     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..7e1d5ea0efb4626362b8c5a240d3da0735f2a3c9 100644
--- a/oop-platform-chart/charts/oeg/values.yaml
+++ b/oop-platform-chart/charts/oeg/values.yaml
@@ -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