diff --git a/send/affiliation_mapping b/send/affiliation_mapping
index 2e26e2ef..baf5ac9b 100755
--- a/send/affiliation_mapping
+++ b/send/affiliation_mapping
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="affiliation_mapping"
+export SERVICE_NAME="affiliation_mapping"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/affiliation_mapping_mu b/send/affiliation_mapping_mu
index 75df6fea..0ed84855 100755
--- a/send/affiliation_mapping_mu
+++ b/send/affiliation_mapping_mu
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="affiliation_mapping_mu"
+export SERVICE_NAME="affiliation_mapping_mu"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/afs b/send/afs
index 21d2bb14..fd593799 100755
--- a/send/afs
+++ b/send/afs
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="afs"
+export SERVICE_NAME="afs"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/afs_group b/send/afs_group
index af30d7a3..638569d2 100755
--- a/send/afs_group
+++ b/send/afs_group
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="afs_group"
+export SERVICE_NAME="afs_group"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/apache_basic_auth b/send/apache_basic_auth
index 659e3692..452ac2ac 100755
--- a/send/apache_basic_auth
+++ b/send/apache_basic_auth
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="apache_basic_auth"
+export SERVICE_NAME="apache_basic_auth"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/arcgis_licenses_mu b/send/arcgis_licenses_mu
index 832c682c..6584e469 100755
--- a/send/arcgis_licenses_mu
+++ b/send/arcgis_licenses_mu
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="arcgis_licenses_mu"
+export SERVICE_NAME="arcgis_licenses_mu"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/arcgis_mu b/send/arcgis_mu
index 3ed961d3..2bee0bb0 100755
--- a/send/arcgis_mu
+++ b/send/arcgis_mu
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="arcgis_mu"
+export SERVICE_NAME="arcgis_mu"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/ceitec_proteomics b/send/ceitec_proteomics
index 13e52801..02e0d645 100755
--- a/send/ceitec_proteomics
+++ b/send/ceitec_proteomics
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="ceitec_proteomics"
+export SERVICE_NAME="ceitec_proteomics"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/drupal_elixir b/send/drupal_elixir
index 9bb32bec..9c4d9b36 100755
--- a/send/drupal_elixir
+++ b/send/drupal_elixir
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="drupal_elixir"
+export SERVICE_NAME="drupal_elixir"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/du_info_export b/send/du_info_export
index 57fc6653..c8e0ead3 100755
--- a/send/du_info_export
+++ b/send/du_info_export
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="du_info_export"
+export SERVICE_NAME="du_info_export"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/du_users_export b/send/du_users_export
index c136edd9..09d558a3 100755
--- a/send/du_users_export
+++ b/send/du_users_export
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="du_users_export"
+export SERVICE_NAME="du_users_export"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/eduroam_block b/send/eduroam_block
index 67df202d..1868b2ed 100755
--- a/send/eduroam_block
+++ b/send/eduroam_block
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="eduroam_block"
+export SERVICE_NAME="eduroam_block"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/eduroam_radius b/send/eduroam_radius
index bcc17d44..ad23a65f 100755
--- a/send/eduroam_radius
+++ b/send/eduroam_radius
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="eduroam_radius"
+export SERVICE_NAME="eduroam_radius"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/fbmi_doors b/send/fbmi_doors
index 7a8daca5..77161c1c 100755
--- a/send/fbmi_doors
+++ b/send/fbmi_doors
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="fbmi_doors"
+export SERVICE_NAME="fbmi_doors"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/fs_home b/send/fs_home
index 3626e7c6..3bf9e789 100755
--- a/send/fs_home
+++ b/send/fs_home
@@ -1,5 +1,4 @@
-#!/bin/bash 
+#!/bin/bash
+export SERVICE_NAME="fs_home"
 
-SERVICE_NAME="fs_home"
-
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/fs_home_mu b/send/fs_home_mu
index 10e8a38d..2b8b8ddc 100755
--- a/send/fs_home_mu
+++ b/send/fs_home_mu
@@ -1,5 +1,4 @@
-#!/bin/bash 
+#!/bin/bash
+export SERVICE_NAME="fs_home_mu"
 
-SERVICE_NAME="fs_home_mu"
-
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/fs_project b/send/fs_project
index b3e47c70..080a6eb4 100755
--- a/send/fs_project
+++ b/send/fs_project
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="fs_project"
+export SERVICE_NAME="fs_project"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/fs_quotas b/send/fs_quotas
index 3d5a4f40..268aaea2 100755
--- a/send/fs_quotas
+++ b/send/fs_quotas
@@ -1,5 +1,4 @@
-#!/bin/bash 
+#!/bin/bash
+export SERVICE_NAME="fs_quotas"
 
-SERVICE_NAME="fs_quotas"
-
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/fs_replicas b/send/fs_replicas
index 7435fc13..559327e3 100755
--- a/send/fs_replicas
+++ b/send/fs_replicas
@@ -1,5 +1,4 @@
-#!/bin/bash 
+#!/bin/bash
+export SERVICE_NAME="fs_replicas"
 
-SERVICE_NAME="fs_replicas"
-
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/fs_scratch b/send/fs_scratch
index 98f8f147..b7cda316 100755
--- a/send/fs_scratch
+++ b/send/fs_scratch
@@ -1,4 +1,4 @@
-#!/bin/bash 
-SERVICE_NAME="fs_scratch"
+#!/bin/bash
+export SERVICE_NAME="fs_scratch"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/fs_scratch_local b/send/fs_scratch_local
index 40fe7af3..6f3b38b4 100755
--- a/send/fs_scratch_local
+++ b/send/fs_scratch_local
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="fs_scratch_local"
+export SERVICE_NAME="fs_scratch_local"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/generic_send.py b/send/generic_send.py
index 2e037400..1205c644 100644
--- a/send/generic_send.py
+++ b/send/generic_send.py
@@ -4,7 +4,7 @@
 import tempfile
 import re
 
-timeout = "5400"  # 90s * 60 sec = 1.5h
+timeout = "7200"  # 120 * 60 sec = 2h
 timeout_kill = "60"  # 60 sec to kill after timeout
 
 perun_cert = "/etc/perun/ssl/perun-send.pem"
diff --git a/send/group b/send/group
index 46f91d25..30c5313c 100755
--- a/send/group
+++ b/send/group
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="group"
+export SERVICE_NAME="group"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/group_mu b/send/group_mu
index eab0056c..9e75ff68 100755
--- a/send/group_mu
+++ b/send/group_mu
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="group_mu"
+export SERVICE_NAME="group_mu"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/group_nfs4 b/send/group_nfs4
index 069bbad1..af7d4b5d 100755
--- a/send/group_nfs4
+++ b/send/group_nfs4
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="group_nfs4"
+export SERVICE_NAME="group_nfs4"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/hadoop_hbase b/send/hadoop_hbase
index 8b7db21e..e3b3700e 100755
--- a/send/hadoop_hbase
+++ b/send/hadoop_hbase
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="hadoop_hbase"
+export SERVICE_NAME="hadoop_hbase"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/hadoop_hdfs b/send/hadoop_hdfs
index c2117097..5b0d466c 100755
--- a/send/hadoop_hdfs
+++ b/send/hadoop_hdfs
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="hadoop_hdfs"
+export SERVICE_NAME="hadoop_hdfs"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/k5login b/send/k5login
index 45d8c800..3e0c9d7b 100755
--- a/send/k5login
+++ b/send/k5login
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="k5login"
+export SERVICE_NAME="k5login"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/k5login_generic b/send/k5login_generic
index 7d260132..1a1c40a5 100755
--- a/send/k5login_generic
+++ b/send/k5login_generic
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="k5login_generic"
+export SERVICE_NAME="k5login_generic"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/k5login_root b/send/k5login_root
index 7498bf72..1650307d 100755
--- a/send/k5login_root
+++ b/send/k5login_root
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="k5login_root"
+export SERVICE_NAME="k5login_root"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/kerberos_renewal_principals b/send/kerberos_renewal_principals
index c71476e7..7fa0f4c7 100755
--- a/send/kerberos_renewal_principals
+++ b/send/kerberos_renewal_principals
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="kerberos_renewal_principals"
+export SERVICE_NAME="kerberos_renewal_principals"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/ldap b/send/ldap
index 6530c23d..20493ede 100755
--- a/send/ldap
+++ b/send/ldap
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="ldap"
+export SERVICE_NAME="ldap"
 
-. generic_send
\ No newline at end of file
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/ldap_vsb_vi b/send/ldap_vsb_vi
index ea252480..7ac43506 100755
--- a/send/ldap_vsb_vi
+++ b/send/ldap_vsb_vi
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="ldap_vsb_vi"
+export SERVICE_NAME="ldap_vsb_vi"
 
-. generic_send
\ No newline at end of file
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/mailaliases b/send/mailaliases
index 008540f4..8363c528 100755
--- a/send/mailaliases
+++ b/send/mailaliases
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="mailaliases"
+export SERVICE_NAME="mailaliases"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/mailaliases_generic b/send/mailaliases_generic
index d4ead914..4d1bddee 100755
--- a/send/mailaliases_generic
+++ b/send/mailaliases_generic
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="mailaliases_generic"
+export SERVICE_NAME="mailaliases_generic"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/mailman b/send/mailman
index 72b905c3..c5565d13 100755
--- a/send/mailman
+++ b/send/mailman
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="mailman"
+export SERVICE_NAME="mailman"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/mailman_cesnet b/send/mailman_cesnet
index e34f3295..338c88e4 100755
--- a/send/mailman_cesnet
+++ b/send/mailman_cesnet
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="mailman_cesnet"
+export SERVICE_NAME="mailman_cesnet"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/mailman_cesnet_user_mail b/send/mailman_cesnet_user_mail
index 7b58ae52..f36226e2 100755
--- a/send/mailman_cesnet_user_mail
+++ b/send/mailman_cesnet_user_mail
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="mailman_cesnet_user_mail"
+export SERVICE_NAME="mailman_cesnet_user_mail"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/mailman_elixir b/send/mailman_elixir
index af3d0e41..36edb89b 100755
--- a/send/mailman_elixir
+++ b/send/mailman_elixir
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="mailman_elixir"
+export SERVICE_NAME="mailman_elixir"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/mailman_mu b/send/mailman_mu
index 9c48b8e0..7220d8a4 100755
--- a/send/mailman_mu
+++ b/send/mailman_mu
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="mailman_mu"
+export SERVICE_NAME="mailman_mu"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/mailman_owners b/send/mailman_owners
index 24b07f7a..008b976c 100755
--- a/send/mailman_owners
+++ b/send/mailman_owners
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="mailman_owners"
+export SERVICE_NAME="mailman_owners"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/o365_mu_process.pl b/send/o365_mu_process.pl
index e8889c9b..8d0dd781 100755
--- a/send/o365_mu_process.pl
+++ b/send/o365_mu_process.pl
@@ -251,7 +251,7 @@
 				#exception means a problem, return an error, do not add to the cache
 				if($exception) {
 					my $exceptionType = $resultUser->{'ExceptionType'};
-					print "WARNING - User with ID $key was not processed properly due to: " . $exceptionType . " -- " . $exception . "\n";
+					print STDERR "WARNING - User with ID $key was not processed properly due to: " . $exceptionType . " -- " . $exception . "\n";
 					$failedUsers++;
 					$returnCode = 1;
 				} else {
@@ -262,7 +262,7 @@
 				}
 			} else {
 				#if user was not processed at all, it is also an error, do not add to the cache
-				print "WARNING - User with ID $key was timeouted (not processed).\n";
+				print STDERR "WARNING - User with ID $key was timeouted (not processed).\n";
 				$failedUsers++;
 				$returnCode = 1;
 			}
@@ -297,7 +297,7 @@
 				#exception means a problem, return an error, do not add to the cache
 				if($exception) {
 					my $exceptionType = $resultGroup->{'ExceptionType'};
-					print "WARNING - Group with ID $key was not processed properly due to: " . $exceptionType . " -- " . $exception . "\n";
+					print STDERR "WARNING - Group with ID $key was not processed properly due to: " . $exceptionType . " -- " . $exception . "\n";
 					$failedGroups++;
 					$returnCode = 1;
 				} else {
@@ -308,7 +308,7 @@
 				}
 			} else {
 				#if user was not processed at all, it is also an error, do not add to the cache
-				print "WARNING - Group with ID $key was timeouted (not processed).\n";
+				print STDERR "WARNING - Group with ID $key was timeouted (not processed).\n";
 				$failedGroups++;
 				$returnCode = 1;
 			}
@@ -474,7 +474,7 @@ sub readDataAboutUsers {
 
 		#If UPN is from any reason empty, set global return code to 1 and skip this user
 		unless($UPN) {
-			print "WARNING - Can't find UPN for user in $pathToFile for line '$line'\n";
+			print STDERR "WARNING - Can't find UPN for user in $pathToFile for line '$line'\n";
 			$returnCode = 1;
 			next;
 		}
@@ -507,7 +507,7 @@ sub readDataAboutGroups {
 
 		#If groupADName is from any reason empty, set global return code to 1 and skip this group
 		unless($line) {
-			print "WARNING - Can't find AD name of group in $pathToFile for line '$line'\n";
+			print STDERR "WARNING - Can't find AD name of group in $pathToFile for line '$line'\n";
 			$returnCode = 1;
 			next;
 		}
@@ -676,7 +676,7 @@ sub callServerForUpdate {
 
 	#0 in $counter means timeout
 	unless($counter) {
-		print "WARNING - Batch operation for command '" . $command . "' timeouted. Only '" . $processedParametersCount . "' from '" . $parametersCount . "' were processed before the timeout from Perun site.\n";
+		print STDERR "WARNING - Batch operation for command '" . $command . "' timeouted. Only '" . $processedParametersCount . "' from '" . $parametersCount . "' were processed before the timeout from Perun site.\n";
 		$returnCode = 1;
 	}
 
diff --git a/send/oidc_with_groups_einfra b/send/oidc_with_groups_einfra
index 1e6416d0..300e2f20 100755
--- a/send/oidc_with_groups_einfra
+++ b/send/oidc_with_groups_einfra
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="oidc_with_groups_einfra"
+export SERVICE_NAME="oidc_with_groups_einfra"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/operations_portal_egi b/send/operations_portal_egi
index eaf54bb2..d3cd70e2 100755
--- a/send/operations_portal_egi
+++ b/send/operations_portal_egi
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="operations_portal_egi"
+export SERVICE_NAME="operations_portal_egi"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/passwd b/send/passwd
index dae9beaa..e1d0c11d 100755
--- a/send/passwd
+++ b/send/passwd
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="passwd"
+export SERVICE_NAME="passwd"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/passwd_mu b/send/passwd_mu
index ee9a0650..a5fcccb0 100755
--- a/send/passwd_mu
+++ b/send/passwd_mu
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="passwd_mu"
+export SERVICE_NAME="passwd_mu"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/passwd_nfs4 b/send/passwd_nfs4
index 9c5bb556..5626930f 100755
--- a/send/passwd_nfs4
+++ b/send/passwd_nfs4
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="passwd_nfs4"
+export SERVICE_NAME="passwd_nfs4"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/passwd_nfs4_mu b/send/passwd_nfs4_mu
index 7baaa238..4dac3ff6 100755
--- a/send/passwd_nfs4_mu
+++ b/send/passwd_nfs4_mu
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="passwd_nfs4_mu"
+export SERVICE_NAME="passwd_nfs4_mu"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/passwd_scp b/send/passwd_scp
index 248c93d2..0f709ea5 100755
--- a/send/passwd_scp
+++ b/send/passwd_scp
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="passwd_scp"
+export SERVICE_NAME="passwd_scp"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/pbs_publication_fairshare b/send/pbs_publication_fairshare
index 1c58bdee..bb70e7fd 100755
--- a/send/pbs_publication_fairshare
+++ b/send/pbs_publication_fairshare
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="pbs_publication_fairshare"
+export SERVICE_NAME="pbs_publication_fairshare"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/pbsmon_json b/send/pbsmon_json
index a24cfe6d..729e4526 100755
--- a/send/pbsmon_json
+++ b/send/pbsmon_json
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="pbsmon_json"
+export SERVICE_NAME="pbsmon_json"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/pbsmon_users b/send/pbsmon_users
index e6c70025..c2e21793 100755
--- a/send/pbsmon_users
+++ b/send/pbsmon_users
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="pbsmon_users"
+export SERVICE_NAME="pbsmon_users"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/puppet_dashboard b/send/puppet_dashboard
index 41f8ce1e..3d05ecd4 100755
--- a/send/puppet_dashboard
+++ b/send/puppet_dashboard
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="puppet_dashboard"
+export SERVICE_NAME="puppet_dashboard"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/rt b/send/rt
index c324789f..0c64d082 100755
--- a/send/rt
+++ b/send/rt
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="rt"
+export SERVICE_NAME="rt"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/sshkeys b/send/sshkeys
index 3e5c8e75..446fb3f0 100755
--- a/send/sshkeys
+++ b/send/sshkeys
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="sshkeys"
+export SERVICE_NAME="sshkeys"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/sshkeys_generic b/send/sshkeys_generic
index 62395704..03c72886 100755
--- a/send/sshkeys_generic
+++ b/send/sshkeys_generic
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="sshkeys_generic"
+export SERVICE_NAME="sshkeys_generic"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/sshkeys_root b/send/sshkeys_root
index 3ca6a06d..6df2ec30 100755
--- a/send/sshkeys_root
+++ b/send/sshkeys_root
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="sshkeys_root"
+export SERVICE_NAME="sshkeys_root"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/sympa b/send/sympa
index b34f70dd..90ecf091 100755
--- a/send/sympa
+++ b/send/sympa
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="sympa"
+export SERVICE_NAME="sympa"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/teams_provisioning b/send/teams_provisioning
index a129d54b..6c009b54 100755
--- a/send/teams_provisioning
+++ b/send/teams_provisioning
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="teams_provisioning"
+export SERVICE_NAME="teams_provisioning"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/umbraco_mu b/send/umbraco_mu
index 841c3a33..fc5d3e5b 100755
--- a/send/umbraco_mu
+++ b/send/umbraco_mu
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="umbraco_mu"
+export SERVICE_NAME="umbraco_mu"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/vmware_ldap b/send/vmware_ldap
index ae8a5cca..8f4c34f2 100755
--- a/send/vmware_ldap
+++ b/send/vmware_ldap
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="vmware_ldap"
+export SERVICE_NAME="vmware_ldap"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/voms b/send/voms
index eb8a897e..260731af 100755
--- a/send/voms
+++ b/send/voms
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="voms"
+export SERVICE_NAME="voms"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/voms_dirac b/send/voms_dirac
index bc6e0a43..7fa85357 100755
--- a/send/voms_dirac
+++ b/send/voms_dirac
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="voms_dirac"
+export SERVICE_NAME="voms_dirac"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"
diff --git a/send/yubikey_root b/send/yubikey_root
index d8e63431..3a07901a 100755
--- a/send/yubikey_root
+++ b/send/yubikey_root
@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="yubikey_root"
+export SERVICE_NAME="yubikey_root"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"