diff --git a/.github/workflows/docker-discordbot.yml b/.github/workflows/docker-discordbot.yml
new file mode 100644
index 00000000..90d670dd
--- /dev/null
+++ b/.github/workflows/docker-discordbot.yml
@@ -0,0 +1,28 @@
+name: Docker - Discord Bot
+
+
+on:
+  push:
+    branches:
+      - master
+    tags:
+      - 'v*.*.*'
+    paths:
+      - Tools/BiblioTech
+      - '!Tools/BiblioTech/docker/docker-compose.yaml'
+      - Framework
+      - ProjectPlugins
+      - .github/workflows/docker-discordbot.yml
+      - .github/workflows/docker-reusable.yml
+  workflow_dispatch:
+
+
+jobs:
+  build-and-push:
+    name: Build and Push
+    uses: ./.github/workflows/docker-reusable.yml
+    with:
+      docker_file: Tools/BiblioTech/docker/Dockerfile
+      docker_repo: codexstorage/codex-discordbot
+    secrets: inherit
+
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker-runner.yml
similarity index 83%
rename from .github/workflows/docker.yml
rename to .github/workflows/docker-runner.yml
index 87edbe92..dd2e8997 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker-runner.yml
@@ -1,4 +1,4 @@
-name: Docker
+name: Docker - Runner
 
 
 on:
@@ -10,7 +10,7 @@ on:
     paths:
       - docker/Dockerfile
       - docker/docker-entrypoint.sh
-      - .github/workflows/docker.yml
+      - .github/workflows/docker-runner.yml
       - .github/workflows/docker-reusable.yml
   workflow_dispatch:
 
diff --git a/.github/workflows/continuous-tests.yaml b/.github/workflows/run-continuous-tests.yaml
similarity index 100%
rename from .github/workflows/continuous-tests.yaml
rename to .github/workflows/run-continuous-tests.yaml
diff --git a/.github/workflows/dist-tests.yaml b/.github/workflows/run-dist-tests.yaml
similarity index 100%
rename from .github/workflows/dist-tests.yaml
rename to .github/workflows/run-dist-tests.yaml
diff --git a/Tools/BiblioTech/docker/Dockerfile b/Tools/BiblioTech/docker/Dockerfile
index 7b7d6c77..98df2fb9 100644
--- a/Tools/BiblioTech/docker/Dockerfile
+++ b/Tools/BiblioTech/docker/Dockerfile
@@ -1,7 +1,14 @@
-FROM mcr.microsoft.com/dotnet/sdk:7.0
+# Variables
+ARG IMAGE=mcr.microsoft.com/dotnet/sdk:7.0
+ARG APP_HOME=/app
 
-WORKDIR app
+# Create
+FROM ${IMAGE}
+ARG APP_HOME
+
+WORKDIR ${APP_HOME}
 COPY ./Tools/BiblioTech ./Tools/BiblioTech
 COPY ./Framework ./Framework
 COPY ./ProjectPlugins ./ProjectPlugins
 CMD ["dotnet", "run", "--project", "Tools/BiblioTech"]
+