diff --git a/app/executor.php b/app/executor.php
index 76f938b8d7..fba8c4c416 100644
--- a/app/executor.php
+++ b/app/executor.php
@@ -503,7 +503,7 @@ App::post('/v1/execution')
 
             $ch = \curl_init();
             $body = \json_encode([
-                'env' => $vars,
+                'variables' => $vars,
                 'payload' => $data,
                 'timeout' => $timeout
             ]);
diff --git a/tests/resources/functions/dart/main.dart b/tests/resources/functions/dart/main.dart
index 93463e9321..0a6cabdac7 100644
--- a/tests/resources/functions/dart/main.dart
+++ b/tests/resources/functions/dart/main.dart
@@ -2,7 +2,7 @@
     'req' variable has:
         'headers' - object with request headers
         'payload' - object with request body data
-        'env' - object with environment variables
+        'variables' - object with function variables
     'res' variable has:
         'send(text, status)' - function to return text response. Status code defaults to 200
         'json(obj, status)' - function to return JSON response. Status code defaults to 200
@@ -12,18 +12,18 @@
 
 Future<void> start(final request, final response) async {
     response.json({
-        'APPWRITE_FUNCTION_ID' : request.env['APPWRITE_FUNCTION_ID'],
-        'APPWRITE_FUNCTION_NAME' : request.env['APPWRITE_FUNCTION_NAME'],
-        'APPWRITE_FUNCTION_DEPLOYMENT' : request.env['APPWRITE_FUNCTION_DEPLOYMENT'],
-        'APPWRITE_FUNCTION_TRIGGER' : request.env['APPWRITE_FUNCTION_TRIGGER'],
-        'APPWRITE_FUNCTION_RUNTIME_NAME' : request.env['APPWRITE_FUNCTION_RUNTIME_NAME'],
-        'APPWRITE_FUNCTION_RUNTIME_VERSION' : request.env['APPWRITE_FUNCTION_RUNTIME_VERSION'],
-        'APPWRITE_FUNCTION_EVENT' : request.env['APPWRITE_FUNCTION_EVENT'],
-        'APPWRITE_FUNCTION_EVENT_DATA' : request.env['APPWRITE_FUNCTION_EVENT_DATA'],
-        'APPWRITE_FUNCTION_DATA' : request.env['APPWRITE_FUNCTION_DATA'],
-        'APPWRITE_FUNCTION_USER_ID' : request.env['APPWRITE_FUNCTION_USER_ID'],
-        'APPWRITE_FUNCTION_JWT' : request.env['APPWRITE_FUNCTION_JWT'],
-        'APPWRITE_FUNCTION_PROJECT_ID' : request.env['APPWRITE_FUNCTION_PROJECT_ID'],
-        'CUSTOM_VARIABLE' : request.env['CUSTOM_VARIABLE']
+        'APPWRITE_FUNCTION_ID' : request.variables['APPWRITE_FUNCTION_ID'],
+        'APPWRITE_FUNCTION_NAME' : request.variables['APPWRITE_FUNCTION_NAME'],
+        'APPWRITE_FUNCTION_DEPLOYMENT' : request.variables['APPWRITE_FUNCTION_DEPLOYMENT'],
+        'APPWRITE_FUNCTION_TRIGGER' : request.variables['APPWRITE_FUNCTION_TRIGGER'],
+        'APPWRITE_FUNCTION_RUNTIME_NAME' : request.variables['APPWRITE_FUNCTION_RUNTIME_NAME'],
+        'APPWRITE_FUNCTION_RUNTIME_VERSION' : request.variables['APPWRITE_FUNCTION_RUNTIME_VERSION'],
+        'APPWRITE_FUNCTION_EVENT' : request.variables['APPWRITE_FUNCTION_EVENT'],
+        'APPWRITE_FUNCTION_EVENT_DATA' : request.variables['APPWRITE_FUNCTION_EVENT_DATA'],
+        'APPWRITE_FUNCTION_DATA' : request.variables['APPWRITE_FUNCTION_DATA'],
+        'APPWRITE_FUNCTION_USER_ID' : request.variables['APPWRITE_FUNCTION_USER_ID'],
+        'APPWRITE_FUNCTION_JWT' : request.variables['APPWRITE_FUNCTION_JWT'],
+        'APPWRITE_FUNCTION_PROJECT_ID' : request.variables['APPWRITE_FUNCTION_PROJECT_ID'],
+        'CUSTOM_VARIABLE' : request.variables['CUSTOM_VARIABLE']
     });
 }
\ No newline at end of file
diff --git a/tests/resources/functions/node/index.js b/tests/resources/functions/node/index.js
index 67e011e77e..7f190bcaf5 100644
--- a/tests/resources/functions/node/index.js
+++ b/tests/resources/functions/node/index.js
@@ -2,7 +2,7 @@
     'req' variable has:
         'headers' - object with request headers
         'payload' - object with request body data
-        'env' - object with environment variables
+        'variables' - object with function variables
     'res' variable has:
         'send(text, status)' - function to return text response. Status code defaults to 200
         'json(obj, status)' - function to return JSON response. Status code defaults to 200
@@ -12,18 +12,18 @@
 
 module.exports = async(req, res) => {
     res.json({
-        'APPWRITE_FUNCTION_ID' : req.env.APPWRITE_FUNCTION_ID,
-        'APPWRITE_FUNCTION_NAME' : req.env.APPWRITE_FUNCTION_NAME,
-        'APPWRITE_FUNCTION_DEPLOYMENT' : req.env.APPWRITE_FUNCTION_DEPLOYMENT,
-        'APPWRITE_FUNCTION_TRIGGER' : req.env.APPWRITE_FUNCTION_TRIGGER,
-        'APPWRITE_FUNCTION_RUNTIME_NAME' : req.env.APPWRITE_FUNCTION_RUNTIME_NAME,
-        'APPWRITE_FUNCTION_RUNTIME_VERSION' : req.env.APPWRITE_FUNCTION_RUNTIME_VERSION,
-        'APPWRITE_FUNCTION_EVENT' : req.env.APPWRITE_FUNCTION_EVENT,
-        'APPWRITE_FUNCTION_EVENT_DATA' : req.env.APPWRITE_FUNCTION_EVENT_DATA,
-        'APPWRITE_FUNCTION_DATA' : req.env.APPWRITE_FUNCTION_DATA,
-        'APPWRITE_FUNCTION_USER_ID' : req.env.APPWRITE_FUNCTION_USER_ID,
-        'APPWRITE_FUNCTION_JWT' : req.env.APPWRITE_FUNCTION_JWT,
-        'APPWRITE_FUNCTION_PROJECT_ID' : req.env.APPWRITE_FUNCTION_PROJECT_ID,
-        'CUSTOM_VARIABLE' : req.env.CUSTOM_VARIABLE
+        'APPWRITE_FUNCTION_ID' : req.variables.APPWRITE_FUNCTION_ID,
+        'APPWRITE_FUNCTION_NAME' : req.variables.APPWRITE_FUNCTION_NAME,
+        'APPWRITE_FUNCTION_DEPLOYMENT' : req.variables.APPWRITE_FUNCTION_DEPLOYMENT,
+        'APPWRITE_FUNCTION_TRIGGER' : req.variables.APPWRITE_FUNCTION_TRIGGER,
+        'APPWRITE_FUNCTION_RUNTIME_NAME' : req.variables.APPWRITE_FUNCTION_RUNTIME_NAME,
+        'APPWRITE_FUNCTION_RUNTIME_VERSION' : req.variables.APPWRITE_FUNCTION_RUNTIME_VERSION,
+        'APPWRITE_FUNCTION_EVENT' : req.variables.APPWRITE_FUNCTION_EVENT,
+        'APPWRITE_FUNCTION_EVENT_DATA' : req.variables.APPWRITE_FUNCTION_EVENT_DATA,
+        'APPWRITE_FUNCTION_DATA' : req.variables.APPWRITE_FUNCTION_DATA,
+        'APPWRITE_FUNCTION_USER_ID' : req.variables.APPWRITE_FUNCTION_USER_ID,
+        'APPWRITE_FUNCTION_JWT' : req.variables.APPWRITE_FUNCTION_JWT,
+        'APPWRITE_FUNCTION_PROJECT_ID' : req.variables.APPWRITE_FUNCTION_PROJECT_ID,
+        'CUSTOM_VARIABLE' : req.variables.CUSTOM_VARIABLE
     });
 }
\ No newline at end of file
diff --git a/tests/resources/functions/php-fn/index.php b/tests/resources/functions/php-fn/index.php
index e3ce05829c..7947c4a6a6 100644
--- a/tests/resources/functions/php-fn/index.php
+++ b/tests/resources/functions/php-fn/index.php
@@ -4,17 +4,17 @@ return function ($request, $response) {
     \var_dump("Amazing Function Log"); // We test logs (stdout) visibility with this
 
     $response->json([
-        'APPWRITE_FUNCTION_ID' => $request['env']['APPWRITE_FUNCTION_ID'],
-        'APPWRITE_FUNCTION_NAME' => $request['env']['APPWRITE_FUNCTION_NAME'],
-        'APPWRITE_FUNCTION_DEPLOYMENT' => $request['env']['APPWRITE_FUNCTION_DEPLOYMENT'],
-        'APPWRITE_FUNCTION_TRIGGER' => $request['env']['APPWRITE_FUNCTION_TRIGGER'],
-        'APPWRITE_FUNCTION_RUNTIME_NAME' => $request['env']['APPWRITE_FUNCTION_RUNTIME_NAME'],
-        'APPWRITE_FUNCTION_RUNTIME_VERSION' => $request['env']['APPWRITE_FUNCTION_RUNTIME_VERSION'],
-        'APPWRITE_FUNCTION_EVENT' => $request['env']['APPWRITE_FUNCTION_EVENT'],
-        'APPWRITE_FUNCTION_EVENT_DATA' => $request['env']['APPWRITE_FUNCTION_EVENT_DATA'],
-        'APPWRITE_FUNCTION_DATA' => $request['env']['APPWRITE_FUNCTION_DATA'],
-        'APPWRITE_FUNCTION_USER_ID' => $request['env']['APPWRITE_FUNCTION_USER_ID'],
-        'APPWRITE_FUNCTION_JWT' => $request['env']['APPWRITE_FUNCTION_JWT'],
-        'APPWRITE_FUNCTION_PROJECT_ID' => $request['env']['APPWRITE_FUNCTION_PROJECT_ID'],
+        'APPWRITE_FUNCTION_ID' => $request['variables']['APPWRITE_FUNCTION_ID'],
+        'APPWRITE_FUNCTION_NAME' => $request['variables']['APPWRITE_FUNCTION_NAME'],
+        'APPWRITE_FUNCTION_DEPLOYMENT' => $request['variables']['APPWRITE_FUNCTION_DEPLOYMENT'],
+        'APPWRITE_FUNCTION_TRIGGER' => $request['variables']['APPWRITE_FUNCTION_TRIGGER'],
+        'APPWRITE_FUNCTION_RUNTIME_NAME' => $request['variables']['APPWRITE_FUNCTION_RUNTIME_NAME'],
+        'APPWRITE_FUNCTION_RUNTIME_VERSION' => $request['variables']['APPWRITE_FUNCTION_RUNTIME_VERSION'],
+        'APPWRITE_FUNCTION_EVENT' => $request['variables']['APPWRITE_FUNCTION_EVENT'],
+        'APPWRITE_FUNCTION_EVENT_DATA' => $request['variables']['APPWRITE_FUNCTION_EVENT_DATA'],
+        'APPWRITE_FUNCTION_DATA' => $request['variables']['APPWRITE_FUNCTION_DATA'],
+        'APPWRITE_FUNCTION_USER_ID' => $request['variables']['APPWRITE_FUNCTION_USER_ID'],
+        'APPWRITE_FUNCTION_JWT' => $request['variables']['APPWRITE_FUNCTION_JWT'],
+        'APPWRITE_FUNCTION_PROJECT_ID' => $request['variables']['APPWRITE_FUNCTION_PROJECT_ID'],
     ]);
 };
diff --git a/tests/resources/functions/php-large/index.php b/tests/resources/functions/php-large/index.php
index 8bd0de5e60..84b6a991fe 100644
--- a/tests/resources/functions/php-large/index.php
+++ b/tests/resources/functions/php-large/index.php
@@ -2,14 +2,14 @@
 
 return function ($request, $response) {
     return $response->json([
-        'APPWRITE_FUNCTION_ID' => $request['env']['APPWRITE_FUNCTION_ID'],
-        'APPWRITE_FUNCTION_NAME' => $request['env']['APPWRITE_FUNCTION_NAME'],
-        'APPWRITE_FUNCTION_DEPLOYMENT' => $request['env']['APPWRITE_FUNCTION_DEPLOYMENT'],
-        'APPWRITE_FUNCTION_TRIGGER' => $request['env']['APPWRITE_FUNCTION_TRIGGER'],
-        'APPWRITE_FUNCTION_RUNTIME_NAME' => $request['env']['APPWRITE_FUNCTION_RUNTIME_NAME'],
-        'APPWRITE_FUNCTION_RUNTIME_VERSION' => $request['env']['APPWRITE_FUNCTION_RUNTIME_VERSION'],
-        'APPWRITE_FUNCTION_EVENT' => $request['env']['APPWRITE_FUNCTION_EVENT'],
-        'APPWRITE_FUNCTION_EVENT_DATA' => $request['env']['APPWRITE_FUNCTION_EVENT_DATA'],
+        'APPWRITE_FUNCTION_ID' => $request['variables']['APPWRITE_FUNCTION_ID'],
+        'APPWRITE_FUNCTION_NAME' => $request['variables']['APPWRITE_FUNCTION_NAME'],
+        'APPWRITE_FUNCTION_DEPLOYMENT' => $request['variables']['APPWRITE_FUNCTION_DEPLOYMENT'],
+        'APPWRITE_FUNCTION_TRIGGER' => $request['variables']['APPWRITE_FUNCTION_TRIGGER'],
+        'APPWRITE_FUNCTION_RUNTIME_NAME' => $request['variables']['APPWRITE_FUNCTION_RUNTIME_NAME'],
+        'APPWRITE_FUNCTION_RUNTIME_VERSION' => $request['variables']['APPWRITE_FUNCTION_RUNTIME_VERSION'],
+        'APPWRITE_FUNCTION_EVENT' => $request['variables']['APPWRITE_FUNCTION_EVENT'],
+        'APPWRITE_FUNCTION_EVENT_DATA' => $request['variables']['APPWRITE_FUNCTION_EVENT_DATA'],
         'UNICODE_TEST' => "êä"
     ]);
 };
diff --git a/tests/resources/functions/php/index.php b/tests/resources/functions/php/index.php
index 8bd0de5e60..84b6a991fe 100644
--- a/tests/resources/functions/php/index.php
+++ b/tests/resources/functions/php/index.php
@@ -2,14 +2,14 @@
 
 return function ($request, $response) {
     return $response->json([
-        'APPWRITE_FUNCTION_ID' => $request['env']['APPWRITE_FUNCTION_ID'],
-        'APPWRITE_FUNCTION_NAME' => $request['env']['APPWRITE_FUNCTION_NAME'],
-        'APPWRITE_FUNCTION_DEPLOYMENT' => $request['env']['APPWRITE_FUNCTION_DEPLOYMENT'],
-        'APPWRITE_FUNCTION_TRIGGER' => $request['env']['APPWRITE_FUNCTION_TRIGGER'],
-        'APPWRITE_FUNCTION_RUNTIME_NAME' => $request['env']['APPWRITE_FUNCTION_RUNTIME_NAME'],
-        'APPWRITE_FUNCTION_RUNTIME_VERSION' => $request['env']['APPWRITE_FUNCTION_RUNTIME_VERSION'],
-        'APPWRITE_FUNCTION_EVENT' => $request['env']['APPWRITE_FUNCTION_EVENT'],
-        'APPWRITE_FUNCTION_EVENT_DATA' => $request['env']['APPWRITE_FUNCTION_EVENT_DATA'],
+        'APPWRITE_FUNCTION_ID' => $request['variables']['APPWRITE_FUNCTION_ID'],
+        'APPWRITE_FUNCTION_NAME' => $request['variables']['APPWRITE_FUNCTION_NAME'],
+        'APPWRITE_FUNCTION_DEPLOYMENT' => $request['variables']['APPWRITE_FUNCTION_DEPLOYMENT'],
+        'APPWRITE_FUNCTION_TRIGGER' => $request['variables']['APPWRITE_FUNCTION_TRIGGER'],
+        'APPWRITE_FUNCTION_RUNTIME_NAME' => $request['variables']['APPWRITE_FUNCTION_RUNTIME_NAME'],
+        'APPWRITE_FUNCTION_RUNTIME_VERSION' => $request['variables']['APPWRITE_FUNCTION_RUNTIME_VERSION'],
+        'APPWRITE_FUNCTION_EVENT' => $request['variables']['APPWRITE_FUNCTION_EVENT'],
+        'APPWRITE_FUNCTION_EVENT_DATA' => $request['variables']['APPWRITE_FUNCTION_EVENT_DATA'],
         'UNICODE_TEST' => "êä"
     ]);
 };
diff --git a/tests/resources/functions/python/main.py b/tests/resources/functions/python/main.py
index af7d79ab23..ff78d6d336 100644
--- a/tests/resources/functions/python/main.py
+++ b/tests/resources/functions/python/main.py
@@ -3,7 +3,7 @@ import json
 #    'req' variable has:
 #        'headers' - object with request headers
 #        'payload' - object with request body data
-#        'env' - object with environment variables
+#        'variables' - object with function variables
 #    'res' variable has:
 #        'send(text, status)' - function to return text response. Status code defaults to 200
 #        'json(obj, status)' - function to return JSON response. Status code defaults to 200
@@ -12,17 +12,17 @@ import json
 
 def main(request, response):
     return response.json({
-        'APPWRITE_FUNCTION_ID' : request.env['APPWRITE_FUNCTION_ID'],
-        'APPWRITE_FUNCTION_NAME' : request.env['APPWRITE_FUNCTION_NAME'],
-        'APPWRITE_FUNCTION_DEPLOYMENT' : request.env['APPWRITE_FUNCTION_DEPLOYMENT'],
-        'APPWRITE_FUNCTION_TRIGGER' : request.env['APPWRITE_FUNCTION_TRIGGER'],
-        'APPWRITE_FUNCTION_RUNTIME_NAME' : request.env['APPWRITE_FUNCTION_RUNTIME_NAME'],
-        'APPWRITE_FUNCTION_RUNTIME_VERSION' : request.env['APPWRITE_FUNCTION_RUNTIME_VERSION'],
-        'APPWRITE_FUNCTION_EVENT' : request.env['APPWRITE_FUNCTION_EVENT'],
-        'APPWRITE_FUNCTION_EVENT_DATA' : request.env['APPWRITE_FUNCTION_EVENT_DATA'],
-        'APPWRITE_FUNCTION_DATA' : request.env['APPWRITE_FUNCTION_DATA'],
-        'APPWRITE_FUNCTION_USER_ID' : request.env['APPWRITE_FUNCTION_USER_ID'],
-        'APPWRITE_FUNCTION_JWT' : request.env['APPWRITE_FUNCTION_JWT'],
-        'APPWRITE_FUNCTION_PROJECT_ID' : request.env['APPWRITE_FUNCTION_PROJECT_ID'],
-        'CUSTOM_VARIABLE' : request.env['CUSTOM_VARIABLE'],
+        'APPWRITE_FUNCTION_ID' : request.variables['APPWRITE_FUNCTION_ID'],
+        'APPWRITE_FUNCTION_NAME' : request.variables['APPWRITE_FUNCTION_NAME'],
+        'APPWRITE_FUNCTION_DEPLOYMENT' : request.variables['APPWRITE_FUNCTION_DEPLOYMENT'],
+        'APPWRITE_FUNCTION_TRIGGER' : request.variables['APPWRITE_FUNCTION_TRIGGER'],
+        'APPWRITE_FUNCTION_RUNTIME_NAME' : request.variables['APPWRITE_FUNCTION_RUNTIME_NAME'],
+        'APPWRITE_FUNCTION_RUNTIME_VERSION' : request.variables['APPWRITE_FUNCTION_RUNTIME_VERSION'],
+        'APPWRITE_FUNCTION_EVENT' : request.variables['APPWRITE_FUNCTION_EVENT'],
+        'APPWRITE_FUNCTION_EVENT_DATA' : request.variables['APPWRITE_FUNCTION_EVENT_DATA'],
+        'APPWRITE_FUNCTION_DATA' : request.variables['APPWRITE_FUNCTION_DATA'],
+        'APPWRITE_FUNCTION_USER_ID' : request.variables['APPWRITE_FUNCTION_USER_ID'],
+        'APPWRITE_FUNCTION_JWT' : request.variables['APPWRITE_FUNCTION_JWT'],
+        'APPWRITE_FUNCTION_PROJECT_ID' : request.variables['APPWRITE_FUNCTION_PROJECT_ID'],
+        'CUSTOM_VARIABLE' : request.variables['CUSTOM_VARIABLE'],
     })
\ No newline at end of file
diff --git a/tests/resources/functions/ruby/main.rb b/tests/resources/functions/ruby/main.rb
index 41b9b0fc52..d6ccdfb073 100644
--- a/tests/resources/functions/ruby/main.rb
+++ b/tests/resources/functions/ruby/main.rb
@@ -2,7 +2,7 @@
     'req' variable has:
         'headers' - object with request headers
         'payload' - object with request body data
-        'env' - object with environment variables
+        'variables' - object with function variables
     'res' variable has:
         'send(text, status)' - function to return text response. Status code defaults to 200
         'json(obj, status)' - function to return JSON response. Status code defaults to 200
@@ -12,18 +12,18 @@
 
 def main(request, response)
     return response.json({
-        'APPWRITE_FUNCTION_ID' => request.env['APPWRITE_FUNCTION_ID'],
-        'APPWRITE_FUNCTION_NAME' => request.env['APPWRITE_FUNCTION_NAME'],
-        'APPWRITE_FUNCTION_DEPLOYMENT' => request.env['APPWRITE_FUNCTION_DEPLOYMENT'],
-        'APPWRITE_FUNCTION_TRIGGER' => request.env['APPWRITE_FUNCTION_TRIGGER'],
-        'APPWRITE_FUNCTION_RUNTIME_NAME' => request.env['APPWRITE_FUNCTION_RUNTIME_NAME'],
-        'APPWRITE_FUNCTION_RUNTIME_VERSION' => request.env['APPWRITE_FUNCTION_RUNTIME_VERSION'],
-        'APPWRITE_FUNCTION_EVENT' => request.env['APPWRITE_FUNCTION_EVENT'],
-        'APPWRITE_FUNCTION_EVENT_DATA' => request.env['APPWRITE_FUNCTION_EVENT_DATA'],
-        'APPWRITE_FUNCTION_DATA' => request.env['APPWRITE_FUNCTION_DATA'],
-        'APPWRITE_FUNCTION_USER_ID' => request.env['APPWRITE_FUNCTION_USER_ID'],
-        'APPWRITE_FUNCTION_JWT' => request.env['APPWRITE_FUNCTION_JWT'],
-        'APPWRITE_FUNCTION_PROJECT_ID' => request.env['APPWRITE_FUNCTION_PROJECT_ID'],
-        'CUSTOM_VARIABLE' => request.env['CUSTOM_VARIABLE']
+        'APPWRITE_FUNCTION_ID' => request.variables['APPWRITE_FUNCTION_ID'],
+        'APPWRITE_FUNCTION_NAME' => request.variables['APPWRITE_FUNCTION_NAME'],
+        'APPWRITE_FUNCTION_DEPLOYMENT' => request.variables['APPWRITE_FUNCTION_DEPLOYMENT'],
+        'APPWRITE_FUNCTION_TRIGGER' => request.variables['APPWRITE_FUNCTION_TRIGGER'],
+        'APPWRITE_FUNCTION_RUNTIME_NAME' => request.variables['APPWRITE_FUNCTION_RUNTIME_NAME'],
+        'APPWRITE_FUNCTION_RUNTIME_VERSION' => request.variables['APPWRITE_FUNCTION_RUNTIME_VERSION'],
+        'APPWRITE_FUNCTION_EVENT' => request.variables['APPWRITE_FUNCTION_EVENT'],
+        'APPWRITE_FUNCTION_EVENT_DATA' => request.variables['APPWRITE_FUNCTION_EVENT_DATA'],
+        'APPWRITE_FUNCTION_DATA' => request.variables['APPWRITE_FUNCTION_DATA'],
+        'APPWRITE_FUNCTION_USER_ID' => request.variables['APPWRITE_FUNCTION_USER_ID'],
+        'APPWRITE_FUNCTION_JWT' => request.variables['APPWRITE_FUNCTION_JWT'],
+        'APPWRITE_FUNCTION_PROJECT_ID' => request.variables['APPWRITE_FUNCTION_PROJECT_ID'],
+        'CUSTOM_VARIABLE' => request.variables['CUSTOM_VARIABLE']
     })
 end
\ No newline at end of file
diff --git a/tests/resources/functions/swift/index.swift b/tests/resources/functions/swift/index.swift
index 67b0f35bec..b3dcdbc91a 100644
--- a/tests/resources/functions/swift/index.swift
+++ b/tests/resources/functions/swift/index.swift
@@ -1,17 +1,17 @@
 func main(req: RequestValue, res: RequestResponse) throws -> RequestResponse {
     return res.json(data: [
-        "APPWRITE_FUNCTION_ID": req.env["APPWRITE_FUNCTION_ID"],
-        "APPWRITE_FUNCTION_NAME": req.env["APPWRITE_FUNCTION_NAME"],
-        "APPWRITE_FUNCTION_DEPLOYMENT": req.env["APPWRITE_FUNCTION_DEPLOYMENT"],
-        "APPWRITE_FUNCTION_TRIGGER": req.env["APPWRITE_FUNCTION_TRIGGER"],
-        "APPWRITE_FUNCTION_RUNTIME_NAME": req.env["APPWRITE_FUNCTION_RUNTIME_NAME"],
-        "APPWRITE_FUNCTION_RUNTIME_VERSION": req.env["APPWRITE_FUNCTION_RUNTIME_VERSION"],
-        "APPWRITE_FUNCTION_EVENT": req.env["APPWRITE_FUNCTION_EVENT"],
-        "APPWRITE_FUNCTION_EVENT_DATA": req.env["APPWRITE_FUNCTION_EVENT_DATA"],
-        "APPWRITE_FUNCTION_DATA": req.env["APPWRITE_FUNCTION_DATA"],
-        "APPWRITE_FUNCTION_USER_ID": req.env["APPWRITE_FUNCTION_USER_ID"],
-        "APPWRITE_FUNCTION_JWT": req.env["APPWRITE_FUNCTION_JWT"],
-        "APPWRITE_FUNCTION_PROJECT_ID": req.env["APPWRITE_FUNCTION_PROJECT_ID"],
-        "CUSTOM_VARIABLE": req.env["CUSTOM_VARIABLE"]
+        "APPWRITE_FUNCTION_ID": req.variables["APPWRITE_FUNCTION_ID"],
+        "APPWRITE_FUNCTION_NAME": req.variables["APPWRITE_FUNCTION_NAME"],
+        "APPWRITE_FUNCTION_DEPLOYMENT": req.variables["APPWRITE_FUNCTION_DEPLOYMENT"],
+        "APPWRITE_FUNCTION_TRIGGER": req.variables["APPWRITE_FUNCTION_TRIGGER"],
+        "APPWRITE_FUNCTION_RUNTIME_NAME": req.variables["APPWRITE_FUNCTION_RUNTIME_NAME"],
+        "APPWRITE_FUNCTION_RUNTIME_VERSION": req.variables["APPWRITE_FUNCTION_RUNTIME_VERSION"],
+        "APPWRITE_FUNCTION_EVENT": req.variables["APPWRITE_FUNCTION_EVENT"],
+        "APPWRITE_FUNCTION_EVENT_DATA": req.variables["APPWRITE_FUNCTION_EVENT_DATA"],
+        "APPWRITE_FUNCTION_DATA": req.variables["APPWRITE_FUNCTION_DATA"],
+        "APPWRITE_FUNCTION_USER_ID": req.variables["APPWRITE_FUNCTION_USER_ID"],
+        "APPWRITE_FUNCTION_JWT": req.variables["APPWRITE_FUNCTION_JWT"],
+        "APPWRITE_FUNCTION_PROJECT_ID": req.variables["APPWRITE_FUNCTION_PROJECT_ID"],
+        "CUSTOM_VARIABLE": req.variables["CUSTOM_VARIABLE"]
     ])
 }
\ No newline at end of file