diff --git a/app/workers/functions.php b/app/workers/functions.php
index a85843b38d..2ab1f1f309 100644
--- a/app/workers/functions.php
+++ b/app/workers/functions.php
@@ -425,15 +425,24 @@ class FunctionsV1 extends Worker
                 " --workdir /usr/local/src".
                 " ".\implode(" ", $vars).
                 " {$runtime['image']}".
-                " sh -c 'mv /tmp/code.tar.gz /usr/local/src/code.tar.gz && tar -zxf /usr/local/src/code.tar.gz --strip 1 && rm /usr/local/src/code.tar.gz && tail -f /dev/null'"
+                " tail -f /dev/null"
             , '', $stdout, $stderr, 30);
 
-            $executionEnd = \microtime(true);
-    
             if($exitCode !== 0) {
                 throw new Exception('Failed to create function environment: '.$stderr);
             }
 
+            $exitCodeUntar = Console::execute("docker exec ".
+                $container.
+                " sh -c 'mv /tmp/code.tar.gz /usr/local/src/code.tar.gz && tar -zxf /usr/local/src/code.tar.gz --strip 1 && rm /usr/local/src/code.tar.gz'"
+                , '', $stdout, $stderr, 60);
+
+            if($exitCodeUntar !== 0) {
+                throw new Exception('Failed to extract tar: '.$stderr);
+            }
+
+            $executionEnd = \microtime(true);
+
             $list[$container] = [
                 'name' => $container,
                 'online' => true,