diff --git a/.github/workflows/CD-Docker.yml b/.github/workflows/CD-Docker.yml
new file mode 100644
index 0000000..7edc662
--- /dev/null
+++ b/.github/workflows/CD-Docker.yml
@@ -0,0 +1,22 @@
+name: CD (Docker)
+
+on:
+  push:
+    tags:
+      - "*"
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2.3.3
+
+      - name: Build
+        run: docker build -t tyrrrz/discordchatexporter:${{ github.ref }} -t tyrrrz/discordchatexporter:stable .
+
+      - name: Deploy
+        run: |
+          docker push tyrrrz/discordchatexporter:${{ github.ref }}
+          docker push tyrrrz/discordchatexporter:stable
\ No newline at end of file
diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml
index d8bfe8c..79f1c6a 100644
--- a/.github/workflows/CD.yml
+++ b/.github/workflows/CD.yml
@@ -68,4 +68,4 @@ jobs:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: DiscordChatExporter.Gui/bin/Publish/Archive.zip
           asset_name: DiscordChatExporter.zip
-          asset_content_type: application/zip
+          asset_content_type: application/zip
\ No newline at end of file
diff --git a/.github/workflows/CI-Docker.yml b/.github/workflows/CI-Docker.yml
new file mode 100644
index 0000000..664d512
--- /dev/null
+++ b/.github/workflows/CI-Docker.yml
@@ -0,0 +1,20 @@
+name: CI (Docker)
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2.3.3
+
+      - name: Build
+        run: docker build -t tyrrrz/discordchatexporter:latest .
+
+      - name: Deploy
+        run: docker push tyrrrz/discordchatexporter:latest
\ No newline at end of file