diff --git a/Federated-Deployment/kubernetes/DevDeployment.md b/Federated-Deployment/kubernetes/DevDeployment.md
index 080a1b5c..99308ba3 100644
--- a/Federated-Deployment/kubernetes/DevDeployment.md
+++ b/Federated-Deployment/kubernetes/DevDeployment.md
@@ -20,9 +20,9 @@ kind create cluster --config Federated-Deployment/kubernetes/kind_configuration/
 2. After the nodes are started, you need to taint them properly:
 ```
 kubectl taint nodes kind-control-plane node-role.kubernetes.io/master-
-kubectl label node kind-control-plane nodeType=master
-kubectl label node kind-worker nodeType=worker
-kubectl label node kind-worker2 nodeType=worker
+kubectl label node kind-control-plane master=true
+kubectl label node kind-worker worker=true
+kubectl label node kind-worker2 worker=true
 ```
 
 3. (Optional) Load the docker images to the kuberentes cluster, if not the images will be pulled from dockerhub:
diff --git a/Federated-Deployment/kubernetes/README.md b/Federated-Deployment/kubernetes/README.md
index eee97edc..37ea35b2 100644
--- a/Federated-Deployment/kubernetes/README.md
+++ b/Federated-Deployment/kubernetes/README.md
@@ -48,7 +48,7 @@ kubectl apply -f https://docs.projectcalico.org/v3.20/manifests/calico.yaml
 
 ```
 kubectl taint nodes --all node-role.kubernetes.io/master-
-kubectl label node <master-node-name> nodeType=master
+kubectl label node <master-node-name> master=true
 ```
 
 ### Add a worker node to the cluster
@@ -64,7 +64,7 @@ Use the provided on the **worker** node, with `sudo`, to join the cluster.
 2. Allow worker-specific pods to run on the **worker** node with:
 
 ```
-kubectl label node <worker-node-name> nodeType=worker
+kubectl label node <worker-node-name> worker=true
 ```
 
 3. If the node has status `Ready,SchedulingDisabled` run:
diff --git a/Federated-Deployment/kubernetes/templates/exareme-keystore.yaml b/Federated-Deployment/kubernetes/templates/exareme-keystore.yaml
index 7d889ae3..49e4ce82 100644
--- a/Federated-Deployment/kubernetes/templates/exareme-keystore.yaml
+++ b/Federated-Deployment/kubernetes/templates/exareme-keystore.yaml
@@ -15,7 +15,7 @@ spec:
         app: exareme-keystore
     spec:
       nodeSelector:
-        nodeType: master
+        master: "true"
       containers:
       - name: exareme-keystore
         image: bitnami/consul:1.8.3
diff --git a/Federated-Deployment/kubernetes/templates/exareme-master.yaml b/Federated-Deployment/kubernetes/templates/exareme-master.yaml
index 6f71ff34..bde3693e 100644
--- a/Federated-Deployment/kubernetes/templates/exareme-master.yaml
+++ b/Federated-Deployment/kubernetes/templates/exareme-master.yaml
@@ -15,7 +15,7 @@ spec:
         app: exareme-master
     spec:
       nodeSelector:
-        nodeType: master
+        master: "true"
       containers:
       - name: exareme-master
         image: {{ .Values.exareme_images.repository }}/exareme:{{ .Values.exareme_images.version }}
@@ -61,4 +61,4 @@ spec:
     - protocol: TCP
       port: 9090
       targetPort: 9090
-      nodePort: 30000
+      nodePort: 31000
diff --git a/Federated-Deployment/kubernetes/templates/exareme-worker.yaml b/Federated-Deployment/kubernetes/templates/exareme-worker.yaml
index ce450ea8..2e5e89cc 100644
--- a/Federated-Deployment/kubernetes/templates/exareme-worker.yaml
+++ b/Federated-Deployment/kubernetes/templates/exareme-worker.yaml
@@ -15,7 +15,7 @@ spec:
         app: exareme-worker
     spec:
       nodeSelector:
-        nodeType: worker
+        worker: "true"
       affinity:
         podAntiAffinity:
           requiredDuringSchedulingIgnoredDuringExecution: