diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
new file mode 100644
index 0000000..488b887
--- /dev/null
+++ b/.github/workflows/cicd.yml
@@ -0,0 +1,24 @@
+name: ci-cd
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/master'
+    steps:
+      - uses: actions/checkout@v2 
+        with:
+          fetch-depth: 0
+      - name: deploy to dokku instance
+        uses: idoberko2/dokku-deploy-github-action@v1
+        with:
+          ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
+          dokku-host: 'planner.thermokar.st'
+          app-name: 'webapp'
+          # Keeping the following around, in case of emergencies:
+          # git-push-flags: --force