diff --git a/my_deploy.sh b/my_deploy.sh
index ee17cb3679f6390115917a005cfaf670585c28c7..5d0d3faaa89e873c47c4c4dd910ccb7fd12802df 100755
--- a/my_deploy.sh
+++ b/my_deploy.sh
@@ -20,7 +20,8 @@
 export TFS_REGISTRY_IMAGES="http://localhost:32000/tfs/"
 
 # Set the list of components, separated by spaces, you want to build images for, and deploy.
-export TFS_COMPONENTS="context device pathcomp service slice nbi webui load_generator"
+#export TFS_COMPONENTS="context device pathcomp service slice nbi webui load_generator"
+export TFS_COMPONENTS="context device pathcomp service slice nbi webui"
 
 # Uncomment to activate Monitoring (old)
 #export TFS_COMPONENTS="${TFS_COMPONENTS} monitoring"
@@ -74,11 +75,11 @@ export TFS_COMPONENTS="context device pathcomp service slice nbi webui load_gene
 #   To manage QKD Apps, "service" requires "qkd_app" to be deployed
 #   before "service", thus we "hack" the TFS_COMPONENTS environment variable prepending the
 #   "qkd_app" only if "service" is already in TFS_COMPONENTS, and re-export it.
-#if [[ "$TFS_COMPONENTS" == *"service"* ]]; then
-#    BEFORE="${TFS_COMPONENTS% service*}"
-#    AFTER="${TFS_COMPONENTS#* service}"
-#    export TFS_COMPONENTS="${BEFORE} qkd_app service ${AFTER}"
-#fi
+if [[ "$TFS_COMPONENTS" == *"service"* ]]; then
+    BEFORE="${TFS_COMPONENTS% service*}"
+    AFTER="${TFS_COMPONENTS#* service}"
+    export TFS_COMPONENTS="${BEFORE} qkd_app service ${AFTER}"
+fi
 
 
 # Set the tag you want to use for your images.