diff --git a/.github/workflows/epicmorg.advanced.mattermost.yml b/.github/workflows/epicmorg.advanced.mattermost.yml
index a01a23872..a93b82cfd 100644
--- a/.github/workflows/epicmorg.advanced.mattermost.yml
+++ b/.github/workflows/epicmorg.advanced.mattermost.yml
@@ -8,7 +8,7 @@ on:
 jobs:
 
   build-images:
-    name: Mattermost 
+    name: Nextcloud ${{ matrix.version }}
     runs-on: [ ubuntu-24.04 ]
     strategy:
       matrix:
diff --git a/.github/workflows/epicmorg.advanced.nextcloud.images.yml b/.github/workflows/epicmorg.advanced.nextcloud.images.yml
index 488803c70..06ac5e326 100644
--- a/.github/workflows/epicmorg.advanced.nextcloud.images.yml
+++ b/.github/workflows/epicmorg.advanced.nextcloud.images.yml
@@ -1,4 +1,4 @@
-name: EpicMorg Advanced Nextcloud Images
+name: EpicMorg Nextcloud Images
 
 on:
   workflow_dispatch:
@@ -7,7 +7,7 @@ on:
 
 jobs:
   build-nextcloud-images:
-    name: Build Nextcloud ${{ matrix.version }} Images
+    name: Nextcloud ${{ matrix.version }}
     runs-on: [ ubuntu-24.04 ]
     strategy:
       matrix:
diff --git a/.github/workflows/epicmorg.advanced.teamcity.servers.yml b/.github/workflows/epicmorg.advanced.teamcity.servers.yml
index c1421f7cd..73e3bc772 100644
--- a/.github/workflows/epicmorg.advanced.teamcity.servers.yml
+++ b/.github/workflows/epicmorg.advanced.teamcity.servers.yml
@@ -1,4 +1,4 @@
-name: EpicMorg Advanced TeamCity Servers Images
+name: TeamCity Servers
 
 on:
   workflow_dispatch:
@@ -7,7 +7,7 @@ on:
 
 jobs:
   build-teamcity-servers:
-    name: Build TeamCity Server ${{ matrix.version }} Image
+    name: TC Server ${{ matrix.version }}
     runs-on: [ ubuntu-24.04 ]
     strategy:
       matrix:
diff --git a/.github/workflows/epicmorg.advanced.vscode.images.yml b/.github/workflows/epicmorg.advanced.vscode.images.yml
index bacbee100..657c95b1a 100644
--- a/.github/workflows/epicmorg.advanced.vscode.images.yml
+++ b/.github/workflows/epicmorg.advanced.vscode.images.yml
@@ -1,4 +1,4 @@
-name: EpicMorg Advanced Vscode Server Images
+name: VSCode Servers
 
 on:
   workflow_dispatch:
@@ -7,7 +7,7 @@ on:
 
 jobs:
   build-main-images:
-    name: Build VSCode Main Images
+    name: VSCode Main
     runs-on: [ ubuntu-24.04 ]
     
     steps:
@@ -74,7 +74,7 @@ jobs:
           command: cd linux/advanced/vscode-server/cpp && pwd && make build && make deploy
 
   build-other-images:
-    name: Build VSCode ${{ matrix.image.type }} ${{ matrix.image.version || '' }}
+    name: VSCode ${{ matrix.image.type }} ${{ matrix.image.version || '' }}
     runs-on: [ ubuntu-24.04 ]
     needs: build-main-images
     strategy:
diff --git a/.github/workflows/epicmorg.advanced.zabbix.images.yml b/.github/workflows/epicmorg.advanced.zabbix.images.yml
index 7a8deb935..a6ace0609 100644
--- a/.github/workflows/epicmorg.advanced.zabbix.images.yml
+++ b/.github/workflows/epicmorg.advanced.zabbix.images.yml
@@ -1,4 +1,4 @@
-name: EpicMorg Advanced Zabbix Images
+name: Zabbix Images
 
 on:
   workflow_dispatch:
@@ -7,7 +7,7 @@ on:
 
 jobs:
   build-trunk:
-    name: Build Zabbix trunk Images
+    name: Zabbix Trunk ${{ matrix.image_type }}
     runs-on: [ ubuntu-24.04 ]
     strategy:
       matrix:
@@ -86,7 +86,7 @@ jobs:
 ##################################################################
 
   build-latest:
-    name: Build Zabbix latest Images
+    name: Zabbix Latest ${{ matrix.image_type }}
     runs-on: [ ubuntu-24.04 ]
     needs: build-trunk
     strategy:
@@ -174,7 +174,7 @@ jobs:
 ##################################################################
 
   build-72:
-    name: Build Zabbix 7.2 Images
+    name: Zabbix 7.2 (${{ matrix.image_type }})
     runs-on: [ ubuntu-24.04 ]
     needs: build-latest
     strategy:
@@ -235,7 +235,7 @@ jobs:
           max_attempts: 15
           command: make pip
 
-    - name: Build and Deploy Zabbix 7.2 (${{ matrix.image_type }})
+    - name: Zabbix 7.2 (${{ matrix.image_type }})
       uses: nick-fields/retry@v3
       with:   
           retry_wait_seconds: 45
@@ -254,7 +254,7 @@ jobs:
 ##################################################################
 
   build-70:
-    name: Build Zabbix 7.0 Images
+    name: Zabbix 7.0 (${{ matrix.image_type }})
     runs-on: [ ubuntu-24.04 ]
     needs: build-latest
     strategy:
@@ -315,7 +315,7 @@ jobs:
           max_attempts: 15
           command: make pip
 
-    - name: Build and Deploy Zabbix 7.0 (${{ matrix.image_type }})
+    - name: Zabbix 7.0 (${{ matrix.image_type }})
       uses: nick-fields/retry@v3
       with:   
           retry_wait_seconds: 45
@@ -334,7 +334,7 @@ jobs:
 ##################################################################
 
   build-64:
-    name: Build Zabbix 6.4 Images
+    name: Zabbix 6.4 (${{ matrix.image_type }})
     runs-on: [ ubuntu-24.04 ]
     needs: build-latest
     strategy:
@@ -395,7 +395,7 @@ jobs:
           max_attempts: 15
           command: make pip
 
-    - name: Build and Deploy Zabbix 6.4 (${{ matrix.image_type }})
+    - name: Zabbix 6.4 (${{ matrix.image_type }})
       uses: nick-fields/retry@v3
       with:   
           retry_wait_seconds: 45
@@ -414,7 +414,7 @@ jobs:
 ##################################################################
 
   build-62:
-    name: Build Zabbix 6.2 Images
+    name: Zabbix 6.2 (${{ matrix.image_type }})
     runs-on: [ ubuntu-24.04 ]
     needs: build-latest
     strategy:
@@ -475,7 +475,7 @@ jobs:
           max_attempts: 15
           command: make pip
 
-    - name: Build and Deploy Zabbix 6.2 (${{ matrix.image_type }})
+    - name: Zabbix 6.2 (${{ matrix.image_type }})
       uses: nick-fields/retry@v3
       with:   
           retry_wait_seconds: 45
@@ -494,7 +494,7 @@ jobs:
 ##################################################################
 
   build-60:
-    name: Build Zabbix 6.0 Images
+    name: Zabbix 6.0 (${{ matrix.image_type }})
     runs-on: [ ubuntu-24.04 ]
     needs: build-latest
     strategy:
@@ -555,7 +555,7 @@ jobs:
           max_attempts: 15
           command: make pip
 
-    - name: Build and Deploy Zabbix 6.0 (${{ matrix.image_type }})
+    - name: Zabbix 6.0 (${{ matrix.image_type }})
       uses: nick-fields/retry@v3
       with:   
           retry_wait_seconds: 45
@@ -574,7 +574,7 @@ jobs:
 ##################################################################
 
   build-54:
-    name: Build Zabbix 5.4 Images
+    name: Zabbix 5.4 (${{ matrix.image_type }})
     runs-on: [ ubuntu-24.04 ]
     needs: build-latest
     strategy:
@@ -635,7 +635,7 @@ jobs:
           max_attempts: 15
           command: make pip
 
-    - name: Build and Deploy Zabbix 5.4 (${{ matrix.image_type }})
+    - name: Zabbix 5.4 (${{ matrix.image_type }})
       uses: nick-fields/retry@v3
       with:   
           retry_wait_seconds: 45
@@ -715,7 +715,7 @@ jobs:
           max_attempts: 15
           command: make pip
 
-    - name: Build and Deploy Zabbix 5.2 (${{ matrix.image_type }})
+    - name: Zabbix 5.2 (${{ matrix.image_type }})
       uses: nick-fields/retry@v3
       with:   
           retry_wait_seconds: 45
@@ -734,7 +734,7 @@ jobs:
 ##################################################################
 
   build-50:
-    name: Build Zabbix 5.0 Images
+    name: Zabbix 5.0 (${{ matrix.image_type }})
     runs-on: [ ubuntu-24.04 ]
     needs: build-latest
     strategy:
@@ -795,7 +795,7 @@ jobs:
           max_attempts: 15
           command: make pip
 
-    - name: Build and Deploy Zabbix 5.0 (${{ matrix.image_type }})
+    - name: Zabbix 5.0 (${{ matrix.image_type }})
       uses: nick-fields/retry@v3
       with:   
           retry_wait_seconds: 45
@@ -875,7 +875,7 @@ jobs:
           max_attempts: 15
           command: make pip
 
-    - name: Build and Deploy Zabbix 4.0 (${{ matrix.image_type }})
+    - name: Zabbix 4.0 (${{ matrix.image_type }})
       uses: nick-fields/retry@v3
       with:   
           retry_wait_seconds: 45
@@ -894,7 +894,7 @@ jobs:
 ##################################################################
 
   build-30:
-    name: Build Zabbix 3.0 Images
+    name: Zabbix 3.0 (${{ matrix.image_type }})
     runs-on: [ ubuntu-24.04 ]
     needs: build-latest
     strategy:
@@ -955,7 +955,7 @@ jobs:
           max_attempts: 15
           command: make pip
 
-    - name: Build and Deploy Zabbix 3.0 (${{ matrix.image_type }})
+    - name: Zabbix 3.0 (${{ matrix.image_type }})
       uses: nick-fields/retry@v3
       with:   
           retry_wait_seconds: 45
diff --git a/.github/workflows/epicmorg.base.images.astra.17.yml b/.github/workflows/epicmorg.base.images.astra.17.yml
index 8053cfdea..43707ee75 100644
--- a/.github/workflows/epicmorg.base.images.astra.17.yml
+++ b/.github/workflows/epicmorg.base.images.astra.17.yml
@@ -1,4 +1,4 @@
-name: EpicMorg Astra 1.7 SE Images
+name: Astra 1.7 SE
 
 on:
   workflow_dispatch:
@@ -8,7 +8,7 @@ on:
 jobs:
 
   build-alse-images:
-    name: Build EpicMorg Astra 1.7 SE Images
+    name: Astra 1.7 SE
     runs-on: [ ubuntu-24.04 ]
 
     steps:
diff --git a/.github/workflows/epicmorg.base.images.astra.18.yml b/.github/workflows/epicmorg.base.images.astra.18.yml
index 814b02294..d7e3709bb 100644
--- a/.github/workflows/epicmorg.base.images.astra.18.yml
+++ b/.github/workflows/epicmorg.base.images.astra.18.yml
@@ -1,4 +1,4 @@
-name: EpicMorg Astra 1.8 SE Images
+name: Astra 1.8 SE
 
 on:
   workflow_dispatch:
@@ -8,7 +8,7 @@ on:
 jobs:
 
   build-alse-images:
-    name: Build EpicMorg Astra 1.8 SE Images
+    name: Astra 1.8 SE
     runs-on: [ ubuntu-24.04 ]
 
     steps:
diff --git a/.github/workflows/epicmorg.base.images.astra.rootfs.yml b/.github/workflows/epicmorg.base.images.astra.rootfs.yml
index 12fbe902a..61fa18b33 100644
--- a/.github/workflows/epicmorg.base.images.astra.rootfs.yml
+++ b/.github/workflows/epicmorg.base.images.astra.rootfs.yml
@@ -1,4 +1,4 @@
-name: EpicMorg Astra rootFS Images
+name: Astra rootFS
 
 on:
   workflow_dispatch:
@@ -8,7 +8,7 @@ on:
 jobs:
 
   build-alse-images:
-    name: Build EpicMorg Astra rootFS Images
+    name: Astra rootFS ${{ matrix.version }}
     runs-on: [ ubuntu-24.04 ]
     strategy:
       matrix:
diff --git a/.github/workflows/epicmorg.ecosystem.images.misc.yml b/.github/workflows/epicmorg.ecosystem.images.misc.yml
index 60e5f3616..a3e20f135 100644
--- a/.github/workflows/epicmorg.ecosystem.images.misc.yml
+++ b/.github/workflows/epicmorg.ecosystem.images.misc.yml
@@ -556,64 +556,3 @@ jobs:
           command: cd linux/ecosystem/telegram/bot/quotes && make build && make deploy
 
 ##################################################################################
-
-  build-steamcmd-image:
-    name: EpicMorg EcoSystem SteamCMD Image
-    runs-on: [ ubuntu-24.04 ]
-
-    steps:
-    - uses: actions/checkout@v4
-      with: 
-          clean:  true
-          show-progress:  true
-          submodules:  true
-    
-    - name: Log into docker registry
-      uses: nick-fields/retry@v3
-      with:   
-          retry_wait_seconds: 45
-          timeout_minutes: 600
-          max_attempts: 15
-          command: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
-
-    - name: Log into Quay.IO registry
-      uses: nick-fields/retry@v3
-      with:   
-          retry_wait_seconds: 45
-          timeout_minutes: 600
-          max_attempts: 15
-          command: echo "${{ secrets.QUAY_SERVER_KEY }}" | docker login -u "${{ secrets.QUAY_SERVER_LOGIN }}" --password-stdin "${{ secrets.QUAY_SERVER_URL }}"
-
-    - name: Check buildah
-      uses: nick-fields/retry@v3
-      with:   
-          retry_wait_seconds: 45
-          timeout_minutes: 600
-          max_attempts: 15
-          command: buildah --version
-
-    - name: Test Make
-      uses: nick-fields/retry@v3
-      with:   
-          retry_wait_seconds: 45
-          timeout_minutes: 600
-          max_attempts: 15
-          command: make
- 
-    - name: Build and Deploy SteamCMD
-      uses: nick-fields/retry@v3
-      with:   
-          retry_wait_seconds: 45
-          timeout_minutes: 600
-          max_attempts: 15
-          command: cd linux/ecosystem/steamcmd && make build && make deploy
-
-##################################################################################
-
-    - name: Cleanup
-      uses: nick-fields/retry@v3
-      with:   
-          retry_wait_seconds: 45
-          timeout_minutes: 600
-          max_attempts: 15
-          command: make clean
diff --git a/.github/workflows/epicmorg.games.yml b/.github/workflows/epicmorg.games.yml
new file mode 100644
index 000000000..2749b5ee7
--- /dev/null
+++ b/.github/workflows/epicmorg.games.yml
@@ -0,0 +1,71 @@
+name:  EpicMorg Games Ecosystem
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron:  '1 1 * * 2,4,6'
+
+jobs:
+
+##################################################################################
+
+  build-steamcmd-image:
+    name: SteamCMD
+    runs-on: [ ubuntu-24.04 ]
+
+    steps:
+    - uses: actions/checkout@v4
+      with: 
+          clean:  true
+          show-progress:  true
+          submodules:  true
+    
+    - name: Log into docker registry
+      uses: nick-fields/retry@v3
+      with:   
+          retry_wait_seconds: 45
+          timeout_minutes: 600
+          max_attempts: 15
+          command: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
+
+    - name: Log into Quay.IO registry
+      uses: nick-fields/retry@v3
+      with:   
+          retry_wait_seconds: 45
+          timeout_minutes: 600
+          max_attempts: 15
+          command: echo "${{ secrets.QUAY_SERVER_KEY }}" | docker login -u "${{ secrets.QUAY_SERVER_LOGIN }}" --password-stdin "${{ secrets.QUAY_SERVER_URL }}"
+
+    - name: Check buildah
+      uses: nick-fields/retry@v3
+      with:   
+          retry_wait_seconds: 45
+          timeout_minutes: 600
+          max_attempts: 15
+          command: buildah --version
+
+    - name: Test Make
+      uses: nick-fields/retry@v3
+      with:   
+          retry_wait_seconds: 45
+          timeout_minutes: 600
+          max_attempts: 15
+          command: make
+ 
+    - name: Build and Deploy SteamCMD
+      uses: nick-fields/retry@v3
+      with:   
+          retry_wait_seconds: 45
+          timeout_minutes: 600
+          max_attempts: 15
+          command: cd linux/ecosystem/steamcmd && make build && make deploy
+
+##################################################################################
+
+    - name: Cleanup
+      uses: nick-fields/retry@v3
+      with:   
+          retry_wait_seconds: 45
+          timeout_minutes: 600
+          max_attempts: 15
+          command: make clean
diff --git a/README.md b/README.md
index a8bc0c7de..275c1eada 100644
--- a/README.md
+++ b/README.md
@@ -13,15 +13,15 @@ A collection of docker images for production use. This repo contains 2 types of
 
 | Name | Homepage |
 |:-------------|-------------:|
-| `Quai.io` (default) | https://quay.io/organization/epicmorg | 
-| `DockerHub` (Mirror) | https://hub.docker.com/r/epicmorg |
+| `DockerHub` (Default) | https://hub.docker.com/r/epicmorg |
+| `Quai.io` (Mirror) | https://quay.io/organization/epicmorg | 
 | `Harbor` (Mirror)  | [https://hub.epicm.org/epicmorg](https://hub.epicm.org/account/sign-in?globalSearch=epicmorg) | 
 
 ## Docker and Podman support:
 | Docker | Podman |
 |:-------------|-------------:|
-|  `docker pull quay.io/epicmorg/debian:boowkorm` |  `podman pull quay.io/epicmorg/debian:boowkorm` |
 |  `docker pull epicmorg/debian:boowkorm` |  `podman pull epicmorg/debian:boowkorm` |
+|  `docker pull quay.io/epicmorg/debian:boowkorm` |  `podman pull quay.io/epicmorg/debian:boowkorm` |
 |  `docker pull hub.epicm.org/epicmorg/debian:boowkorm` |  `podman pull hub.epicm.org/epicmorg/ debian:boowkorm` |
 
 ## Support Document for Docker Image Concepts in Project
@@ -102,7 +102,7 @@ For more information - look at `Support Document` to replace this tags and image
 | [![GHA](https://img.shields.io/github/actions/workflow/status/EpicMorg/docker/epicmorg.advanced.zabbix.images.yml?label=Zabbix%20Images&logo=Zabbix%20Images&style=flat-square)](https://github.com/EpicMorg/docker/actions/workflows/epicmorg.advanced.zabbix.images.yml)  | [![GHA](https://img.shields.io/github/actions/workflow/status/EpicMorg/docker/epicmorg.ecosystem.images.testrail.yml?label=Testrail%20Images&logo=Testrail%20Images&style=flat-square)](https://github.com/EpicMorg/docker/actions/workflows/epicmorg.ecosystem.images.testrail.yml)
 | [![GHA](https://img.shields.io/github/actions/workflow/status/EpicMorg/docker/epicmorg.advanced.vscode.images.yml?label=Vscode%20Server%20Images&logo=Vscode%20Server%20Images&style=flat-square)](https://github.com/EpicMorg/docker/actions/workflows/epicmorg.advanced.vscode.images.yml) | [![GHA](https://img.shields.io/github/actions/workflow/status/EpicMorg/docker/epicmorg.ecosystem.images.teamcity.agents.yml?label=TeamCity%20Agents%20Images&logo=TeamCity%20Agents%20Images&style=flat-square)](https://github.com/EpicMorg/docker/actions/workflows/epicmorg.ecosystem.images.teamcity.agents.yml)
 | [![GHA](https://img.shields.io/github/actions/workflow/status/EpicMorg/docker/epicmorg.advanced.teamcity.servers.yml?label=TeamCity%20Servers&logo=EpicMorg%20TeamCity%20Servers&style=flat-square)](https://github.com/EpicMorg/docker/actions/workflows/epicmorg.advanced.teamcity.servers.yml) | [![GHA](https://img.shields.io/github/actions/workflow/status/EpicMorg/docker/epicmorg.ecosystem.images.misc.yml?label=EcoSystem%20Misc%20Images&logo=EcoSystem%20Misc%20Images&style=flat-square)](https://github.com/EpicMorg/docker/actions/workflows/epicmorg.ecosystem.images.misc.yml)
-| [![GHA](https://img.shields.io/github/actions/workflow/status/EpicMorg/docker/epicmorg.advanced.cassandra.yml?label=Cassandra&logo=Cassandra&style=flat-square)](https://github.com/EpicMorg/docker/actions/workflows/epicmorg.advanced.cassandra.yml) | [![GHA](https://img.shields.io/github/actions/workflow/status/EpicMorg/docker/epicmorg.ecosystem.images.atlassian.latest.yml?label=Atlassian%20Latest%20Images&logo=Atlassian%20Latest%20Images&style=flat-square)](https://github.com/EpicMorg/docker/actions/workflows/epicmorg.ecosystem.images.atlassian.latest.yml)
+| [![GHA](https://img.shields.io/github/actions/workflow/status/EpicMorg/docker/epicmorg.ecosystem.cassandra.yml?label=Cassandra&logo=Cassandra&style=flat-square)](https://github.com/EpicMorg/docker/actions/workflows/epicmorg.ecosystem.cassandra.yml) | [![GHA](https://img.shields.io/github/actions/workflow/status/EpicMorg/docker/epicmorg.ecosystem.images.atlassian.latest.yml?label=Atlassian%20Latest%20Images&logo=Atlassian%20Latest%20Images&style=flat-square)](https://github.com/EpicMorg/docker/actions/workflows/epicmorg.ecosystem.images.atlassian.latest.yml)
 | :no_entry_sign: | [![GHA](https://img.shields.io/github/actions/workflow/status/EpicMorg/docker/epicmorg.ecosystem.images.perforce.yml?label=Perfocre%20Images&logo=Perfocre%20Images&style=flat-square)](https://github.com/EpicMorg/docker/actions/workflows/epicmorg.ecosystem.images.perforce.yml)
 | :no_entry_sign: | [![GHA](https://img.shields.io/github/actions/workflow/status/EpicMorg/docker/epicmorg.ecosystem.images.giltab.runners.yml?label=Gitlab%20Runner%20Images&logo=Gitlab%20Runner%20Images&style=flat-square)](https://github.com/EpicMorg/docker/actions/workflows/epicmorg.ecosystem.images.giltab.runners.yml)
 | :no_entry_sign: | [![GHA](https://img.shields.io/github/actions/workflow/status/EpicMorg/docker/epicmorg.ecosystem.images.github.runners.yml?label=GitHub%20Runner%20Images&logo=GitHub%20Runner%20Images&style=flat-square)](https://github.com/EpicMorg/docker/actions/workflows/epicmorg.ecosystem.images.github.runners.yml)
diff --git a/games/7d2d/Dockerfile b/games/7d2d/Dockerfile
index 4f577beb2..5753cfbd4 100644
--- a/games/7d2d/Dockerfile
+++ b/games/7d2d/Dockerfile
@@ -1,7 +1,7 @@
 ##############################################
 # 7d2d dedicated server
 ##############################################
-FROM docker.io/epicmorg/steamcmd:linux
+FROM docker.io/epicmorg/games:steamcmd
 LABEL maintainer="Guahos, chipmunkzombie@gmail.com"
 
 #Steam App ID
diff --git a/games/7d2d/Makefile b/games/7d2d/Makefile
index 1ee997ddf..ff56425bb 100644
--- a/games/7d2d/Makefile
+++ b/games/7d2d/Makefile
@@ -1,19 +1,44 @@
-build: 
-	docker build --tag "7d2d_ds:latest" .
+all: app
 
-run:
-	docker run -itd --name "7d2d-docker" -p 26900-26903:26900-26903/udp -p 26900:26900/tcp -p 8080-8081:8080-8081 -v 7d2dvol:/valve/volume 7d2d_ds:latest
+app:
+	make pip
+	make build
+	make deploy
+	make clean
 
-start:
-	docker start 7d2d_ds
+build:
+	make build-buildah
 
-stop:
-	docker stop 7d2d_ds
-    
-showlog:
-	tail -f `find /var/lib/docker/volumes/7d2dvol/_data -name *log -printf "%T+\t%p\n" | sort`
-    
-showvol:
-	ls -laht /var/lib/docker/volumes/7d2dvol/_data
-    
+deploy:
+	make deploy-buildah
 
+build-buildah:
+	buildah-wrapper --build --squash
+
+deploy-buildah:
+	buildah-wrapper --deploy
+
+build-kaniko:
+	kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:debug --dry-run
+
+deploy-kaniko:
+	kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:debug
+
+build-compose:
+	docker-compose build --compress --parallel --progress plain
+
+deploy-compose:
+	docker-compose push
+
+clean:
+	docker container prune -f
+	docker image prune -f
+	docker network prune -f
+	docker volume prune -f
+	docker system prune -af
+	buildah rm -a
+	buildah rmi -a
+
+pip:
+	pip3 install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper
+	pip install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper
\ No newline at end of file
diff --git a/games/7d2d/Makefile.prod b/games/7d2d/Makefile.prod
new file mode 100644
index 000000000..1ee997ddf
--- /dev/null
+++ b/games/7d2d/Makefile.prod
@@ -0,0 +1,19 @@
+build: 
+	docker build --tag "7d2d_ds:latest" .
+
+run:
+	docker run -itd --name "7d2d-docker" -p 26900-26903:26900-26903/udp -p 26900:26900/tcp -p 8080-8081:8080-8081 -v 7d2dvol:/valve/volume 7d2d_ds:latest
+
+start:
+	docker start 7d2d_ds
+
+stop:
+	docker stop 7d2d_ds
+    
+showlog:
+	tail -f `find /var/lib/docker/volumes/7d2dvol/_data -name *log -printf "%T+\t%p\n" | sort`
+    
+showvol:
+	ls -laht /var/lib/docker/volumes/7d2dvol/_data
+    
+
diff --git a/games/7d2d/docker-compose.yml b/games/7d2d/docker-compose.yml
index 36e4b316e..71c00bca5 100644
--- a/games/7d2d/docker-compose.yml
+++ b/games/7d2d/docker-compose.yml
@@ -1,11 +1,5 @@
 services:
-  7d2d_server:
-    container_name: 7d2d_ds_v1
-    build: .
-    ports:
-      - "26900-26903:26900-26903"
-      - "8080-8081:8080-8081"
-    restart: always
-    volumes:
-      - /docker/7test/vol:/valve/volume
-
+  app:
+    image: "epicmorg/games:7d2d"
+    build:
+      context: .
diff --git a/games/7d2d/docker-compose.yml.example b/games/7d2d/docker-compose.yml.example
new file mode 100644
index 000000000..36e4b316e
--- /dev/null
+++ b/games/7d2d/docker-compose.yml.example
@@ -0,0 +1,11 @@
+services:
+  7d2d_server:
+    container_name: 7d2d_ds_v1
+    build: .
+    ports:
+      - "26900-26903:26900-26903"
+      - "8080-8081:8080-8081"
+    restart: always
+    volumes:
+      - /docker/7test/vol:/valve/volume
+
diff --git a/games/csgo/Dockerfile b/games/cs2/Dockerfile
similarity index 95%
rename from games/csgo/Dockerfile
rename to games/cs2/Dockerfile
index 9b098ee8c..42040782f 100644
--- a/games/csgo/Dockerfile
+++ b/games/cs2/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/epicmorg/steamcmd:linux
+FROM docker.io/epicmorg/games:steamcmd
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/steamcmd/Makefile b/games/cs2/Makefile
similarity index 100%
rename from linux/ecosystem/steamcmd/Makefile
rename to games/cs2/Makefile
diff --git a/linux/ecosystem/steamcmd/docker-compose.yml b/games/cs2/docker-compose.yml
similarity index 54%
rename from linux/ecosystem/steamcmd/docker-compose.yml
rename to games/cs2/docker-compose.yml
index 1d9f065a2..5671a4fdc 100644
--- a/linux/ecosystem/steamcmd/docker-compose.yml
+++ b/games/cs2/docker-compose.yml
@@ -1,5 +1,5 @@
 services:
   app:
-    image: "epicmorg/steamcmd:linux"
+    image: "epicmorg/games:cs2"
     build:
       context: .
diff --git a/games/csgo/Makefile b/games/csgo/Makefile
deleted file mode 100644
index b26fdeac0..000000000
--- a/games/csgo/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all: emgcmd
-emgcmd:
-	docker build --compress -t epicmorg/linux-csgo .
-	docker push epicmorg/linux-csgo
-
diff --git a/linux/ecosystem/steamcmd/Dockerfile b/games/steamcmd/Dockerfile
similarity index 100%
rename from linux/ecosystem/steamcmd/Dockerfile
rename to games/steamcmd/Dockerfile
diff --git a/games/steamcmd/Makefile b/games/steamcmd/Makefile
new file mode 100644
index 000000000..ff56425bb
--- /dev/null
+++ b/games/steamcmd/Makefile
@@ -0,0 +1,44 @@
+all: app
+
+app:
+	make pip
+	make build
+	make deploy
+	make clean
+
+build:
+	make build-buildah
+
+deploy:
+	make deploy-buildah
+
+build-buildah:
+	buildah-wrapper --build --squash
+
+deploy-buildah:
+	buildah-wrapper --deploy
+
+build-kaniko:
+	kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:debug --dry-run
+
+deploy-kaniko:
+	kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:debug
+
+build-compose:
+	docker-compose build --compress --parallel --progress plain
+
+deploy-compose:
+	docker-compose push
+
+clean:
+	docker container prune -f
+	docker image prune -f
+	docker network prune -f
+	docker volume prune -f
+	docker system prune -af
+	buildah rm -a
+	buildah rmi -a
+
+pip:
+	pip3 install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper
+	pip install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper
\ No newline at end of file
diff --git a/linux/ecosystem/steamcmd/README.md b/games/steamcmd/README.md
similarity index 100%
rename from linux/ecosystem/steamcmd/README.md
rename to games/steamcmd/README.md
diff --git a/games/steamcmd/docker-compose.yml b/games/steamcmd/docker-compose.yml
new file mode 100644
index 000000000..fa5506cdd
--- /dev/null
+++ b/games/steamcmd/docker-compose.yml
@@ -0,0 +1,5 @@
+services:
+  app:
+    image: "epicmorg/games:steamcmd"
+    build:
+      context: .