diff --git a/app/config/environments.php b/app/config/environments.php
index cd312555a..a91aa6153 100644
--- a/app/config/environments.php
+++ b/app/config/environments.php
@@ -5,35 +5,49 @@ return [
         'name' => 'Node.js',
         'version' => '14.5',
         'base' => 'node:14.5-alpine',
-        'image' => 'appwrite/env-node:14.5',
+        'image' => 'appwrite/env-node-14.5:1.0.0',
         'logo' => 'node.png',
     ],
     'php-7.4' => [
         'name' => 'PHP',
         'version' => '7.4',
         'base' => 'php:7.4-cli-alpine',
-        'image' => 'appwrite/env-php:7.4',
+        'image' => 'appwrite/env-php-7.4:1.0.0',
+        'logo' => 'php.png',
+    ],
+    'php-8.0' => [
+        'name' => 'PHP',
+        'version' => '8.0',
+        'base' => 'php:8.0-cli-alpine',
+        'image' => 'appwrite/env-php-8.0:1.0.0',
         'logo' => 'php.png',
     ],
     'ruby-2.7' => [
         'name' => 'Ruby',
         'version' => '2.7',
         'base' => 'ruby:2.7-alpine',
-        'image' => 'appwrite/env-ruby:2.7',
+        'image' => 'appwrite/env-ruby-2.7:1.0.0',
         'logo' => 'ruby.png',
     ],
     'python-3.8' => [
         'name' => 'Python',
         'version' => '3.8',
         'base' => 'python:3.8-alpine',
-        'image' => 'appwrite/env-python:3.8',
+        'image' => 'appwrite/env-python-3.8:1.0.0',
         'logo' => 'python.png',
     ],
     'deno-1.2' => [
         'name' => 'Deno',
         'version' => '1.2',
         'base' => 'hayd/deno:alpine-1.2.0',
-        'image' => 'appwrite/env-deno:1.2',
+        'image' => 'appwrite/env-deno-1.2:1.0.0',
+        'logo' => 'deno.png',
+    ],
+    'deno-1.5' => [
+        'name' => 'Deno',
+        'version' => '1.5',
+        'base' => 'hayd/deno:alpine-1.5.0',
+        'image' => 'appwrite/env-deno-1.5:1.0.0',
         'logo' => 'deno.png',
     ],
     // 'dart-2.8' => [
diff --git a/docker/environments/build.sh b/docker/environments/build.sh
index 49f07b1ea..fe1d22d1e 100644
--- a/docker/environments/build.sh
+++ b/docker/environments/build.sh
@@ -1,19 +1,22 @@
 echo 'Starting build...'
 
 echo 'Deno 1.2...'
-docker buildx build --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/386,linux/ppc64le -t appwrite/env-deno:1.2 ./docker/environments/deno-1.2/ --push
+docker buildx build --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/386,linux/ppc64le -t appwrite/env-deno-1.2:1.0.0 ./docker/environments/deno-1.2/ --push
 
 echo 'Deno 1.5...'
-docker buildx build --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/386,linux/ppc64le -t appwrite/env-deno:1.5 ./docker/environments/deno-1.5/ --push
+docker buildx build --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/386,linux/ppc64le -t appwrite/env-deno-1.5:1.0.0 ./docker/environments/deno-1.5/ --push
 
 echo 'Node 14.5...'
-docker buildx build --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le -t appwrite/env-node:14.5 ./docker/environments/node-14.5/ --push
+docker buildx build --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le -t appwrite/env-node-14.5:1.0.0 ./docker/environments/node-14.5/ --push
 
 echo 'PHP 7.4...'
-docker buildx build --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/386,linux/ppc64le -t appwrite/env-php:7.4 ./docker/environments/php-7.4/ --push
+docker buildx build --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/386,linux/ppc64le -t appwrite/env-php-7.4:1.0.0 ./docker/environments/php-7.4/ --push
+
+echo 'PHP 8.0...'
+docker buildx build --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/386,linux/ppc64le -t appwrite/env-php-8.0:1.0.0 ./docker/environments/php-8.0/ --push
 
 echo 'Python 3.8...'
-docker buildx build --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/386,linux/ppc64le -t appwrite/env-python:3.8 ./docker/environments/python-3.8/ --push
+docker buildx build --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/386,linux/ppc64le -t appwrite/env-python-3.8:1.0.0 ./docker/environments/python-3.8/ --push
 
 echo 'Ruby 2.7...'
-docker buildx build --platform linux/amd64,linux/arm64,linux/386,linux/ppc64le -t appwrite/env-ruby:2.7 ./docker/environments/ruby-2.7/ --push
+docker buildx build --platform linux/amd64,linux/arm64,linux/386,linux/ppc64le -t appwrite/env-ruby-2.7:1.0.0 ./docker/environments/ruby-2.7/ --push
diff --git a/docker/environments/php-8.0/Dockerfile b/docker/environments/php-8.0/Dockerfile
new file mode 100644
index 000000000..221b0c4a1
--- /dev/null
+++ b/docker/environments/php-8.0/Dockerfile
@@ -0,0 +1,9 @@
+FROM php:8.0-cli-alpine
+
+LABEL maintainer="team@appwrite.io"
+
+RUN apk add tar
+
+RUN mkdir /usr/local/src
+
+WORKDIR /usr/local/src/
\ No newline at end of file
diff --git a/tests/e2e/Services/Functions/FunctionsCustomServerTest.php b/tests/e2e/Services/Functions/FunctionsCustomServerTest.php
index b8f31fb87..825dc8228 100644
--- a/tests/e2e/Services/Functions/FunctionsCustomServerTest.php
+++ b/tests/e2e/Services/Functions/FunctionsCustomServerTest.php
@@ -279,7 +279,6 @@ class FunctionsConsoleServerTest extends Scope
         return $data;
     }
 
-
     /**
      * @depends testUpdateTag
      */