diff --git a/charts/incubator/synapse/Chart.yaml b/charts/incubator/synapse/Chart.yaml
index 6fa635dd911..2f9be271816 100644
--- a/charts/incubator/synapse/Chart.yaml
+++ b/charts/incubator/synapse/Chart.yaml
@@ -24,7 +24,7 @@ maintainers:
 name: synapse
 sources: []
 type: application
-version: 0.0.6
+version: 0.0.7
 annotations:
   truecharts.org/catagories: |
     - cloud
diff --git a/charts/incubator/synapse/questions.yaml b/charts/incubator/synapse/questions.yaml
index 5d2700c80d2..06ff942bfa8 100644
--- a/charts/incubator/synapse/questions.yaml
+++ b/charts/incubator/synapse/questions.yaml
@@ -424,16 +424,16 @@ questions:
                                   schema:
                                     type: int
                                     default: 8008
-        - variable: replication
-          label: "Replication Service"
-          description: "The Replication Service"
+        - variable: federation
+          label: "federation Service"
+          description: "The federation service"
           schema:
             additional_attrs: true
             type: dict
             attrs:
 # Include{serviceSelector}
-                    - variable: replication
-                      label: "Replication Service Port Configuration"
+                    - variable: federation
+                      label: "federation Service Port Configuration"
                       schema:
                         additional_attrs: true
                         type: dict
@@ -443,7 +443,7 @@ questions:
                             description: "This port exposes the container port on the service"
                             schema:
                               type: int
-                              default: 9092
+                              default: 8448
                               required: true
                           - variable: advanced
                             label: "Show Advanced settings"
@@ -478,62 +478,7 @@ questions:
                                   description: "The internal(!) port on the container the Application runs on"
                                   schema:
                                     type: int
-                                    default: 9092
-        - variable: metrics
-          label: "Metrics Service"
-          description: "The Metrics Service"
-          schema:
-            additional_attrs: true
-            type: dict
-            attrs:
-# Include{serviceSelector}
-                    - variable: metrics
-                      label: "Replication Service Port Configuration"
-                      schema:
-                        additional_attrs: true
-                        type: dict
-                        attrs:
-                          - variable: port
-                            label: "Port"
-                            description: "This port exposes the container port on the service"
-                            schema:
-                              type: int
-                              default: 9093
-                              required: true
-                          - variable: advanced
-                            label: "Show Advanced settings"
-                            schema:
-                              type: boolean
-                              default: false
-                              show_subquestions_if: true
-                              subquestions:
-                                - variable: protocol
-                                  label: "Port Type"
-                                  schema:
-                                    type: string
-                                    default: "HTTP"
-                                    enum:
-                                      - value: HTTP
-                                        description: "HTTP"
-                                      - value: "HTTPS"
-                                        description: "HTTPS"
-                                      - value: TCP
-                                        description: "TCP"
-                                      - value: "UDP"
-                                        description: "UDP"
-                                - variable: nodePort
-                                  label: "Node Port (Optional)"
-                                  description: "This port gets exposed to the node. Only considered when service type is NodePort, Simple or LoadBalancer"
-                                  schema:
-                                    type: int
-                                    min: 9000
-                                    max: 65535
-                                - variable: targetPort
-                                  label: "Target Port"
-                                  description: "The internal(!) port on the container the Application runs on"
-                                  schema:
-                                    type: int
-                                    default: 9093
+                                    default: 8008
 
   - variable: serviceexpert
     group: "Networking and Services"
diff --git a/charts/incubator/synapse/values.yaml b/charts/incubator/synapse/values.yaml
index 261c9b1daec..a7f2509af15 100644
--- a/charts/incubator/synapse/values.yaml
+++ b/charts/incubator/synapse/values.yaml
@@ -18,6 +18,11 @@ service:
       main:
         port: 8008
         targetPort: 8008
+  federation:
+    ports:
+      federation:
+        port: 8448
+        targetPort: 8008
   replication:
     enabled: true
     ports: