diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4ba1fd0..e7dd1e9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,8 +31,10 @@ deploy release:
   stage: deploy release
   script:
     - curl http://192.168.94.221:3000/it2s-itss-facilities-git
+    - curl http://192.168.94.221:3002/it2s-itss-facilities-git
 
 deploy debug:
   stage: deploy debug
   script:
     - curl http://192.168.94.221:3000/it2s-itss-facilities-debug-git
+    - curl http://192.168.94.221:3002/it2s-itss-facilities-debug-git
diff --git a/src/saem.c b/src/saem.c
index 88d18dd..9408da4 100644
--- a/src/saem.c
+++ b/src/saem.c
@@ -182,7 +182,7 @@ int mk_saem(facilities_t* facilities, uint8_t* b_saem, uint32_t* b_saem_len) {
     uint8_t buf[1024];
     for (int i = 0; i < facilities->tolling.infos.length; ++i) {
         saem->sam.body.serviceInfos->list.array[i] = calloc(1, sizeof(ServiceInfo_t));
-        saem->sam.body.serviceInfos->list.array[i]->serviceID = 0;
+        saem->sam.body.serviceInfos->list.array[i]->serviceID = 1;
 
         saem->sam.body.serviceInfos->list.array[i]->chOptions.extensions = calloc(1, sizeof(ServiceInfoExts_t));
 
@@ -374,7 +374,7 @@ void *sa_service(void *fc) {
         for (int a = 0; a < bulletin->to_consume_len; ++a) {
             // Tolling
             if (facilities->tolling.enabled && 
-                bulletin->to_consume[a]->its_aid == 0 && 
+                bulletin->to_consume[a]->its_aid == 1 && 
                 now > bulletin->to_consume[a]->t_trigger + TOLLING_PAYMENT_MIN_PERIOD_MS &&
                 facilities->station_type != 15) {