diff --git a/.github/workflows/backend-system-tests.yml b/.github/workflows/backend-system-tests.yml
index ad7748df..539f3418 100644
--- a/.github/workflows/backend-system-tests.yml
+++ b/.github/workflows/backend-system-tests.yml
@@ -4,6 +4,9 @@ on:
   pull_request:
     branches:
       - main
+  push:
+    tags:
+      - "v*"
 
 jobs:
   system-tests:
diff --git a/.github/workflows/build-docker-image.yml b/.github/workflows/build-docker-image.yml
index 51254c2b..554cf8f1 100644
--- a/.github/workflows/build-docker-image.yml
+++ b/.github/workflows/build-docker-image.yml
@@ -1,11 +1,8 @@
 name: Create Docker Image
 
 on:
-  push:
-    branches: main
-    paths:
-      - "frontend/**"
-      - "backend/**"
+  release:
+    types: [published]
 
 jobs:
   build:
@@ -23,4 +20,5 @@ jobs:
         run: |
           docker buildx build --push \
              --tag stonith404/pingvin-share:latest \
+             --tag stonith404/pingvin-share:${{  github.ref_name }} \
              --platform linux/amd64,linux/arm64 .
diff --git a/package.json b/package.json
index 44fc56d1..c93ab32e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,11 @@
 {
   "name": "pingvin-share",
+  "version": "0.0.0",
   "scripts": {
     "format": "cd frontend && npm run format && cd ../backend && npm run format",
-    "lint": "cd frontend && npm run lint && cd ../backend && npm run lint"
+    "lint": "cd frontend && npm run lint && cd ../backend && npm run lint",
+    "version": "conventional-changelog -p angular -i CHANGELOG.md -s && git add CHANGELOG.md",
+    "release:patch": "npm version patch -m 'release: %s' && git push && git push --tags",
+    "release:minor": "npm version minor -m 'release: %s' && git push && git push --tags"
   }
 }