diff --git a/app/controllers/api/functions.php b/app/controllers/api/functions.php
index a810d7be5b..d2a1790d94 100644
--- a/app/controllers/api/functions.php
+++ b/app/controllers/api/functions.php
@@ -1621,13 +1621,6 @@ App::post('/v1/functions/:functionId/executions')
         $version = $function->getAttribute('version', 'v2');
         $runtimes = Config::getParam($version === 'v2' ? 'runtimes-v2' : 'runtimes', []);
 
-        /** Auto-update v3 runtimes into v4, remove me after we do migrations */
-        if ($version === 'v3') {
-            $function->setAttribute('version', 'v4');
-            $function = $dbForProject->updateDocument('functions', $function->getId(), $function);
-            $version = 'v4';
-        }
-
         $runtime = (isset($runtimes[$function->getAttribute('runtime', '')])) ? $runtimes[$function->getAttribute('runtime', '')] : null;
 
         if (\is_null($runtime)) {
diff --git a/src/Executor/Executor.php b/src/Executor/Executor.php
index 29ed756932..3206381e95 100644
--- a/src/Executor/Executor.php
+++ b/src/Executor/Executor.php
@@ -75,6 +75,12 @@ class Executor
         $runtimeId = "$projectId-$deploymentId-build";
         $route = "/runtimes";
         $timeout = (int) System::getEnv('_APP_FUNCTIONS_BUILD_TIMEOUT', 900);
+
+        // Remove after migration
+        if ($version == 'v3') {
+            $version = 'v4';
+        }
+
         $params = [
             'runtimeId' => $runtimeId,
             'source' => $source,
@@ -188,6 +194,13 @@ class Executor
 
         $runtimeId = "$projectId-$deploymentId";
         $route = '/runtimes/' . $runtimeId . '/execution';
+
+
+        // Remove after migration
+        if ($version == 'v3') {
+            $version = 'v4';
+        }
+
         $params = [
             'runtimeId' => $runtimeId,
             'variables' => $variables,