diff --git a/manifests/teservice.yaml b/manifests/teservice.yaml
index d27bd42c719c3851df11fc514ba538f39ff9f348..30002bc5264b613deea406515d975c9a939db8ef 100644
--- a/manifests/teservice.yaml
+++ b/manifests/teservice.yaml
@@ -34,7 +34,7 @@ spec:
         image: labs.etsi.org:5050/tfs/controller/te:latest
         imagePullPolicy: Always
         ports:
-        - containerPort: 11010
+        - containerPort: 10030
         env:
         - name: ERLANG_LOGGER_LEVEL
           value: "debug"
@@ -73,8 +73,8 @@ spec:
   ports:
   - name: grpc
     protocol: TCP
-    port: 11010
-    targetPort: 11010
+    port: 10030
+    targetPort: 10030
   - name: pcep
     protocol: TCP
     port: 4189
diff --git a/src/te/Dockerfile b/src/te/Dockerfile
index 98194f2549e8b2dba5ca4dc29f4d81b6460f72cf..446936ca58ed69fe4dffd3161ac5278dbedbb01a 100644
--- a/src/te/Dockerfile
+++ b/src/te/Dockerfile
@@ -42,7 +42,7 @@ RUN apk add --no-cache libgcc libstdc++ && \
 COPY --from=0 /var/teraflow/src/te/_build/prod/rel/tfte /tfte
 
 # Expose relevant ports
-EXPOSE 11010
+EXPOSE 10030
 EXPOSE 4189
 
 ARG ERLANG_LOGGER_LEVEL_DEFAULT=debug
diff --git a/src/te/README.md b/src/te/README.md
index a316571bf408780d43c6003eaaf29825171acd1c..d6f1952ac31b971ee374b7810b6967f863442f58 100644
--- a/src/te/README.md
+++ b/src/te/README.md
@@ -64,9 +64,9 @@ The docker image must be built from the root of the Teraflow project:
 
 ### Open a Console
 
-    $ kubectl --namespace tfs exec -ti $(kubectl --namespace tfs get pods --selector=app=teservice -o name) -- /tfte/bin/tfte remote_console
+    $ kubectl --namespace tfs exec -ti $(kubectl --namespace tfs get pods --selector=app=teservice -o name) -c server -- /tfte/bin/tfte remote_console
 
 
 ## Show Logs
 
-    $ kubectl --namespace tfs logs $(kubectl --namespace tfs get pods --selector=app=teservice -o name)
+    $ kubectl --namespace tfs logs $(kubectl --namespace tfs get pods --selector=app=teservice -o name) -c server
diff --git a/src/te/config/dev.config.template b/src/te/config/dev.config.template
index 5897c4e468e830736e579d7649f8350365ab2ead..6ca3af50603b596f6bc7007f456d40d792a2c570 100644
--- a/src/te/config/dev.config.template
+++ b/src/te/config/dev.config.template
@@ -1,7 +1,7 @@
 [
     {tfte, [
         {services, [
-            {te, [{http, "localhost", 11010, []}], #{}}
+            {te, [{http, "localhost", 10030, []}], #{}}
         ]}
     ]},
 
@@ -30,7 +30,7 @@
                 %cacertfile => ""
             },
             listen_opts => #{
-                port => 11010,
+                port => 10030,
                 ip => {0,0,0,0}
             },
             pool_opts => #{
diff --git a/src/te/tutorial/2-6-te-demo.md b/src/te/tutorial/2-6-te-demo.md
index 9b345203b835e102e214d149f547ea76286db39e..d514adf07b3a84a383982a4b46900b9ea30e9457 100644
--- a/src/te/tutorial/2-6-te-demo.md
+++ b/src/te/tutorial/2-6-te-demo.md
@@ -94,7 +94,7 @@ Then in second console:
 We will setup two unidirectional flow between router 1 and 6.
 We will use the binding label 1111 for the flow from router 1 to router 6, and the binding label 6666 for the flow from router 6 to router 1.
 
-    $ kubectl --namespace tfs exec -ti $(kubectl --namespace tfs get pods --selector=app=teservice -o name) -- /tfte/bin/tfte remote_console
+    $ kubectl --namespace tfs exec -ti $(kubectl --namespace tfs get pods --selector=app=teservice -o name) -c server -- /tfte/bin/tfte remote_console
     1> {ok, Flow1to6} = epce_server:initiate_flow(<<"foo">>, {1, 1, 1, 1}, {6, 6, 6, 6}, 1111).
     2> {ok, Flow6to1} = epce_server:initiate_flow(<<"bar">>, {6, 6, 6, 6}, {1, 1, 1, 1}, 6666).