diff --git a/src/automation/src/main/resources/application.yml b/src/automation/src/main/resources/application.yml
index 24280803e81ecb90933a7ccd531a754b034cabb7..d61f3daa6542aacfba13ce62e33f1ff3b2c2bb72 100644
--- a/src/automation/src/main/resources/application.yml
+++ b/src/automation/src/main/resources/application.yml
@@ -19,7 +19,7 @@ quarkus:
     path: teraflow-automation-banner.txt
   grpc:
     server:
-      port: 9999
+      port: 5050
       enable-reflection-service: true
     clients:
       context:
@@ -54,8 +54,8 @@ quarkus:
         host-port: 8080
         container-port: 8080
       grpc-server:
-        host-port: 9999
-        container-port: 9999
+        host-port: 5050
+        container-port: 5050
     env:
       vars:
         context-service-host: "contextservice"
diff --git a/src/automation/target/kubernetes/kubernetes.yml b/src/automation/target/kubernetes/kubernetes.yml
index 0e4bc0c62fdeb19644d596189a295bba3e53dd97..68a7a59c2fb4ee0bad0ddeb8df2ce00728fa80e5 100644
--- a/src/automation/target/kubernetes/kubernetes.yml
+++ b/src/automation/target/kubernetes/kubernetes.yml
@@ -3,8 +3,8 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    app.quarkus.io/commit-id: fee580ca578000e6006c77704c0d6240e261de0f
-    app.quarkus.io/build-timestamp: 2022-05-27 - 08:02:36 +0000
+    app.quarkus.io/commit-id: 665bca2f1245843e8c99eaa1a2c5315a6c002417
+    app.quarkus.io/build-timestamp: 2022-07-13 - 10:46:17 +0000
   labels:
     app.kubernetes.io/name: automationservice
     app: automationservice
@@ -12,8 +12,8 @@ metadata:
 spec:
   ports:
     - name: grpc-server
-      port: 9999
-      targetPort: 9999
+      port: 5050
+      targetPort: 5050
     - name: http
       port: 8080
       targetPort: 8080
@@ -25,8 +25,8 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   annotations:
-    app.quarkus.io/commit-id: fee580ca578000e6006c77704c0d6240e261de0f
-    app.quarkus.io/build-timestamp: 2022-05-27 - 08:02:36 +0000
+    app.quarkus.io/commit-id: 665bca2f1245843e8c99eaa1a2c5315a6c002417
+    app.quarkus.io/build-timestamp: 2022-07-13 - 10:46:17 +0000
   labels:
     app: automationservice
     app.kubernetes.io/name: automationservice
@@ -39,8 +39,8 @@ spec:
   template:
     metadata:
       annotations:
-        app.quarkus.io/commit-id: fee580ca578000e6006c77704c0d6240e261de0f
-        app.quarkus.io/build-timestamp: 2022-05-27 - 08:02:36 +0000
+        app.quarkus.io/commit-id: 665bca2f1245843e8c99eaa1a2c5315a6c002417
+        app.quarkus.io/build-timestamp: 2022-07-13 - 10:46:17 +0000
       labels:
         app: automationservice
         app.kubernetes.io/name: automationservice
@@ -51,10 +51,10 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-            - name: CONTEXT_SERVICE_HOST
-              value: ContextService
             - name: DEVICE_SERVICE_HOST
               value: DeviceService
+            - name: CONTEXT_SERVICE_HOST
+              value: ContextService
           image: registry.gitlab.com/teraflow-h2020/controller/automation:0.2.0
           imagePullPolicy: Always
           livenessProbe:
@@ -69,7 +69,7 @@ spec:
             timeoutSeconds: 10
           name: automationservice
           ports:
-            - containerPort: 9999
+            - containerPort: 5050
               name: grpc-server
               protocol: TCP
             - containerPort: 8080