diff --git a/.github/workflows/_disabled/docker-linux-develop.yml b/.github/workflows/_disabled/docker-linux-develop.yml.txt
similarity index 100%
rename from .github/workflows/_disabled/docker-linux-develop.yml
rename to .github/workflows/_disabled/docker-linux-develop.yml.txt
diff --git a/.github/workflows/_disabled/docker-linux-master.yml b/.github/workflows/_disabled/docker-linux-master.yml.txt
similarity index 100%
rename from .github/workflows/_disabled/docker-linux-master.yml
rename to .github/workflows/_disabled/docker-linux-master.yml.txt
diff --git a/.github/workflows/_disabled/docker-win32-develop.yml b/.github/workflows/_disabled/docker-win32-develop.yml.txt
similarity index 100%
rename from .github/workflows/_disabled/docker-win32-develop.yml
rename to .github/workflows/_disabled/docker-win32-develop.yml.txt
diff --git a/.github/workflows/_disabled/docker-win32-master.yml b/.github/workflows/_disabled/docker-win32-master.yml.txt
similarity index 100%
rename from .github/workflows/_disabled/docker-win32-master.yml
rename to .github/workflows/_disabled/docker-win32-master.yml.txt
diff --git a/.github/workflows/epicmorg.advanced.images.yml b/.github/workflows/epicmorg.advanced.images.yml
index 567b4aeed..1aafeaab2 100644
--- a/.github/workflows/epicmorg.advanced.images.yml
+++ b/.github/workflows/epicmorg.advanced.images.yml
@@ -1,4 +1,4 @@
-name: epicmorg.advanced.images
+name: EpicMorg Advanced Images
 
 on:
 #  push:
@@ -34,3 +34,8 @@ jobs:
 
     - name: "Build and Deploy Advanced Redash Images:"
       run:  cd linux/advanced/redash && pwd && make sync && make patch && make build && make deploy
+
+##################################################################################
+
+    - name: Cleanup
+      run: make docker-clean
diff --git a/.github/workflows/epicmorg.advanced.nextcloud.images.yml b/.github/workflows/epicmorg.advanced.nextcloud.images.yml
index 110f980a4..fe4a943d3 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
+name:  EpicMorg Advanced Nextcloud Images
 
 on:
 #  push:
@@ -10,7 +10,7 @@ on:
 jobs:
 
   build-pure-images:
-    name: Advanced Nextcloud Stock Images
+    name: EpicMorg Advanced Nextcloud Stock Images
     runs-on: ubuntu-22.04
 
     steps:
@@ -116,4 +116,4 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
diff --git a/.github/workflows/epicmorg.advanced.vscode.images.yml b/.github/workflows/epicmorg.advanced.vscode.images.yml
index ea9af5b44..91408e34f 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.images
+name: "EpicMorg Advanced Vscode Server Images"
 
 on:
 #  push:
@@ -10,7 +10,7 @@ on:
 jobs:
 
   build-images:
-    name: Build EpicMorg Advanced Images
+    name: Build EpicMorg Advanced Vscode Server Images
     runs-on: ubuntu-22.04
 
     steps:
@@ -56,5 +56,5 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
diff --git a/.github/workflows/epicmorg.advanced.zabbix.images.yml b/.github/workflows/epicmorg.advanced.zabbix.images.yml
index f55e49ea0..36c3cc87b 100644
--- a/.github/workflows/epicmorg.advanced.zabbix.images.yml
+++ b/.github/workflows/epicmorg.advanced.zabbix.images.yml
@@ -1,4 +1,4 @@
-name: epicmorg.advanced.nextcloud
+name: EpicMorg Advanced Zabbix Images
 
 on:
 #  push:
@@ -10,7 +10,7 @@ on:
 jobs:
 
   build-latest-images:
-    name: Build EpicMorg Advanced Zabbix Images
+    name: EpicMorg Advanced Zabbix Latest Images
     runs-on: ubuntu-22.04
 
     steps:
@@ -57,7 +57,7 @@ jobs:
 ##################################################################################
 
   build-30-images:
-    name: Build EpicMorg Advanced Zabbix Images
+    name: Build EpicMorg Advanced Zabbix 3.0 Images
     runs-on: ubuntu-22.04
 
     steps:
@@ -101,7 +101,7 @@ jobs:
 ##################################################################################
 
   build-40-images:
-    name: Build EpicMorg Advanced Zabbix Images
+    name: Build EpicMorg Advanced Zabbix 4.0 Images
     runs-on: ubuntu-22.04
 
     steps:
@@ -145,7 +145,7 @@ jobs:
 ##################################################################################
 
   build-50-images:
-    name: Build EpicMorg Advanced Zabbix Images
+    name: Build EpicMorg Advanced Zabbix 5.0 Images
     runs-on: ubuntu-22.04
 
     steps:
@@ -192,7 +192,7 @@ jobs:
 ##################################################################################
 
   build-52-images:
-    name: Build EpicMorg Advanced Zabbix Images
+    name: Build EpicMorg Advanced Zabbix 5.2 Images
     runs-on: ubuntu-22.04
 
     steps:
@@ -239,7 +239,7 @@ jobs:
 ##################################################################################
 
   build-54-images:
-    name: Build EpicMorg Advanced Zabbix Images
+    name: Build EpicMorg Advanced Zabbix 5.4 Images
     runs-on: ubuntu-22.04
 
     steps:
@@ -286,7 +286,7 @@ jobs:
 ##################################################################################
 
   build-60-images:
-    name: Build EpicMorg Advanced Zabbix Images
+    name: Build EpicMorg Advanced Zabbix 6.0 Images
     runs-on: ubuntu-22.04
 
     steps:
@@ -333,7 +333,7 @@ jobs:
 ##################################################################################
 
   build-62-images:
-    name: Build EpicMorg Advanced Zabbix Images
+    name: Build EpicMorg Advanced Zabbix 6.2 Images
     runs-on: ubuntu-22.04
 
     steps:
@@ -380,4 +380,4 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
diff --git a/.github/workflows/epicmorg.base.images.yml b/.github/workflows/epicmorg.base.images.yml
index 1e11c1296..0ea1f94da 100644
--- a/.github/workflows/epicmorg.base.images.yml
+++ b/.github/workflows/epicmorg.base.images.yml
@@ -1,4 +1,4 @@
-name: epicmorg.base.images
+name: EpicMorg Base images
 
 on:
 #  push:
@@ -10,7 +10,7 @@ on:
 jobs:
 
   build-images:
-    name: Build EpicMorg Base images
+    name: Build EpicMorg Base Images
     runs-on: ubuntu-22.04
 
     steps:
@@ -28,3 +28,8 @@ jobs:
 
     - name: Build Bundle of Base Images
       run:  make bundle-base-images
+
+##################################################################################
+
+    - name: Cleanup
+      run: make docker-clean
diff --git a/.github/workflows/torrserver-temp.yml b/.github/workflows/torrserver-temp.yml
index a2c4fd324..fb4845a2f 100644
--- a/.github/workflows/torrserver-temp.yml
+++ b/.github/workflows/torrserver-temp.yml
@@ -31,3 +31,8 @@ jobs:
 
     - name: Push TorrServer
       run:  cd linux/ecosystem/torrserver && make deploy
+
+##################################################################################
+
+    - name: Cleanup
+      run: make docker-clean