diff --git a/Aviso/ATEZ/frmATEZ_EZA.vb b/Aviso/ATEZ/frmATEZ_EZA.vb
index 696cdf9..85e063e 100644
--- a/Aviso/ATEZ/frmATEZ_EZA.vb
+++ b/Aviso/ATEZ/frmATEZ_EZA.vb
@@ -152,7 +152,10 @@ Public Class frmATEZ_EZA
             'If btnPrio_CommInv.Tag = 1 Then combineItemsPriorityDocumentType = "packing_list"
 
 
-            Dim environment = cRelayHubEnvironment.TEST
+            Dim environment = cRelayHubEnvironment.PROD
+            If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then environment = cRelayHubEnvironment.TEST
+
+
             Dim ATEZ_RH_EZA As New VERAG_PROG_ALLGEMEIN.cRelayHub.cRelayHubJobOrderRequest With {
                 .environment = environment,
                 .referenceNo = ioReference,
diff --git a/Aviso/ATEZ/frmATEZ_MIC.vb b/Aviso/ATEZ/frmATEZ_MIC.vb
index 0c43869..6710a4d 100644
--- a/Aviso/ATEZ/frmATEZ_MIC.vb
+++ b/Aviso/ATEZ/frmATEZ_MIC.vb
@@ -94,6 +94,7 @@ Public Class frmATEZ_MIC
             '----------------------------------------------------------------------
             'Dim environment = If(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, cRelayHubEnvironment.TEST, cRelayHubEnvironment.PROD)
             Dim environment = cRelayHubEnvironment.TEST
+
             Dim ATEZ_RH_EZA As New VERAG_PROG_ALLGEMEIN.cRelayHub.cRelayHubJobOrderRequest With {
            .environment = environment,
            .referenceNo = ioReference,
diff --git a/Aviso/ATEZ/frmATEZ_TELOTEC.vb b/Aviso/ATEZ/frmATEZ_TELOTEC.vb
index 843eb75..e6196a4 100644
--- a/Aviso/ATEZ/frmATEZ_TELOTEC.vb
+++ b/Aviso/ATEZ/frmATEZ_TELOTEC.vb
@@ -99,8 +99,12 @@ Public Class frmATEZ_TELOTEC
             '----------------------------------------------------------------------
             ' RelayHub Request - Modaltrans UK
             '----------------------------------------------------------------------
+            Dim environment = cRelayHubEnvironment.TEST
+            If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then environment = cRelayHubEnvironment.TEST
+
             Dim ATEZ_RH_EZA As New VERAG_PROG_ALLGEMEIN.cRelayHub.cRelayHubJobOrderRequest With {
-            .referenceNo = ioReference,
+           .environment = environment,
+           .referenceNo = ioReference,
             .outputApplication = cRelayHubOutputApplication.Modaltrans,
             .regimeType = "IMPORT",
             .dispatchCountry = "TR",
diff --git a/Aviso/ATEZ/frmATEZ_UK_MODAL.vb b/Aviso/ATEZ/frmATEZ_UK_MODAL.vb
index 21070f6..f6b1fb3 100644
--- a/Aviso/ATEZ/frmATEZ_UK_MODAL.vb
+++ b/Aviso/ATEZ/frmATEZ_UK_MODAL.vb
@@ -101,7 +101,9 @@ Public Class frmATEZ_UK_MODAL
             ' RelayHub Request - Modaltrans UK
             '----------------------------------------------------------------------
 
-            Dim environment = cRelayHubEnvironment.TEST
+            Dim environment = cRelayHubEnvironment.PROD
+            If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then environment = cRelayHubEnvironment.TEST
+
             Dim ATEZ_RH_EZA As New VERAG_PROG_ALLGEMEIN.cRelayHub.cRelayHubJobOrderRequest With {
             .environment = environment,
             .referenceNo = ioReference,