diff --git a/.env b/.env
index ad4d4e9a4..5359d6b9a 100644
--- a/.env
+++ b/.env
@@ -52,7 +52,7 @@ _APP_FUNCTIONS_BUILD_TIMEOUT=900
 _APP_FUNCTIONS_CPUS=1
 _APP_FUNCTIONS_MEMORY=512
 _APP_FUNCTIONS_INACTIVE_THRESHOLD=600
-_APP_FUNCTIONS_RUNTIMES_NETWORK=openruntimes-runtimes
+_APP_FUNCTIONS_RUNTIMES_NETWORK=runtimes
 _APP_EXECUTOR_SECRET=your-secret-key
 _APP_EXECUTOR_HOST=http://exc1/v1
 _APP_FUNCTIONS_RUNTIMES=
diff --git a/app/config/variables.php b/app/config/variables.php
index 401326fc3..5fe1bc35c 100644
--- a/app/config/variables.php
+++ b/app/config/variables.php
@@ -846,7 +846,7 @@ return [
                 'name' => '_APP_FUNCTIONS_RUNTIMES_NETWORK',
                 'description' => 'The docker network used for communication between the executor and runtimes. Change this if you have altered the default network names.',
                 'introduction' => '1.2.0',
-                'default' => 'openruntimes-runtimes',
+                'default' => 'runtimes',
                 'required' => false,
                 'question' => '',
                 'filter' => ''
diff --git a/app/views/install/compose.phtml b/app/views/install/compose.phtml
index 966a2b2bd..bac07e841 100644
--- a/app/views/install/compose.phtml
+++ b/app/views/install/compose.phtml
@@ -75,7 +75,7 @@ services:
       - appwrite-cache:/storage/cache:rw
       - appwrite-config:/storage/config:rw
       - appwrite-certificates:/storage/certificates:rw
-      - openruntimes-functions:/storage/functions:rw
+      - appwrite-functions:/storage/functions:rw
     depends_on:
       - mariadb
       - redis
@@ -249,8 +249,8 @@ services:
     volumes: 
       - appwrite-uploads:/storage/uploads:rw
       - appwrite-cache:/storage/cache:rw
-      - openruntimes-functions:/storage/functions:rw
-      - openruntimes-builds:/storage/builds:rw
+      - appwrite-functions:/storage/functions:rw
+      - appwrite-builds:/storage/builds:rw
       - appwrite-certificates:/storage/certificates:rw
     environment:
       - _APP_ENV
@@ -548,11 +548,11 @@ services:
     image: openruntimes/executor:0.1.4
     networks:
       - appwrite
-      - openruntimes-runtimes
+      - runtimes
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
-      - openruntimes-builds:/storage/builds:rw
-      - openruntimes-functions:/storage/functions:rw
+      - appwrite-builds:/storage/builds:rw
+      - appwrite-functions:/storage/functions:rw
       - /tmp:/tmp:rw
     environment:
       - OPR_EXECUTOR_CONNECTION_STORAGE=$_APP_CONNECTIONS_STORAGE
@@ -632,10 +632,8 @@ networks:
     name: gateway
   appwrite:
     name: appwrite
-  openruntimes-runtimes:
-    name: openruntimes-runtimes
-  openruntimes-executors:
-    name: openruntimes-executors
+  runtimes:
+    name: runtimes
 
 volumes:
   appwrite-mariadb:
@@ -645,5 +643,5 @@ volumes:
   appwrite-certificates:
   appwrite-influxdb:
   appwrite-config:
-  openruntimes-functions:
-  openruntimes-builds:
+  appwrite-functions:
+  appwrite-builds:
diff --git a/docker-compose.yml b/docker-compose.yml
index ce8306634..3011e63af 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -85,7 +85,7 @@ services:
       - appwrite-cache:/storage/cache:rw
       - appwrite-config:/storage/config:rw
       - appwrite-certificates:/storage/certificates:rw
-      - openruntimes-functions:/storage/functions:rw
+      - appwrite-functions:/storage/functions:rw
       - ./phpunit.xml:/usr/src/code/phpunit.xml
       - ./tests:/usr/src/code/tests
       - ./app:/usr/src/code/app
@@ -297,8 +297,8 @@ services:
     volumes: 
       - appwrite-uploads:/storage/uploads:rw
       - appwrite-cache:/storage/cache:rw
-      - openruntimes-functions:/storage/functions:rw
-      - openruntimes-builds:/storage/builds:rw
+      - appwrite-functions:/storage/functions:rw
+      - appwrite-builds:/storage/builds:rw
       - appwrite-certificates:/storage/certificates:rw
       - ./app:/usr/src/code/app
       - ./src:/usr/src/code/src
@@ -652,11 +652,11 @@ services:
     image: openruntimes/executor:0.1.4
     networks:
       - appwrite
-      - openruntimes-runtimes
+      - runtimes
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
-      - openruntimes-builds:/storage/builds:rw
-      - openruntimes-functions:/storage/functions:rw
+      - appwrite-builds:/storage/builds:rw
+      - appwrite-functions:/storage/functions:rw
       - /tmp:/tmp:rw
     environment:
       - OPR_EXECUTOR_CONNECTION_STORAGE=$_APP_CONNECTIONS_STORAGE
@@ -834,8 +834,8 @@ networks:
     name: gateway
   appwrite:
     name: appwrite
-  openruntimes-runtimes:
-    name: openruntimes-runtimes
+  runtimes:
+    name: runtimes
 
 volumes:
   appwrite-mariadb:
@@ -845,6 +845,6 @@ volumes:
   appwrite-certificates:
   appwrite-influxdb:
   appwrite-config:
-  openruntimes-functions:
-  openruntimes-builds:
+  appwrite-functions:
+  appwrite-builds:
   # appwrite-chronograf: