diff --git a/.woodpecker.yaml b/.woodpecker.yaml
new file mode 100644
index 0000000..c94a097
--- /dev/null
+++ b/.woodpecker.yaml
@@ -0,0 +1,15 @@
+steps:
+  build:
+    image: docker
+    commands:
+      - "docker login git.snyman.info -u $DOCKER_USERNAME -p $DOCKER_TOKEN"
+      - "docker build --build-arg FLARUM_VERSION=$CI_COMMIT_TAG -t git.snyman.info/raoul/flarum:$CI_COMMIT_TAG -t git.snyman.info/raoul/flarum:latest ."
+      - "docker push git.snyman.info/raoul/flarum:$CI_COMMIT_TAG"
+      - "docker push git.snyman.info/raoul/flarum:latest"
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+    secrets:
+      - docker_username
+      - docker_token
+    when:
+      - event: tag
diff --git a/.woodpecker.yml b/.woodpecker.yml
deleted file mode 100644
index 9f5e2a7..0000000
--- a/.woodpecker.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-steps:
-  build:
-    image: docker
-    commands:
-      - "docker login git.snyman.info -u $DOCKER_USERNAME -p $DOCKER_TOKEN"
-      - "docker build -t git.snyman.info/raoul/flarum ."
-      - "docker push git.snyman.info/raoul/flarum"
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-    secrets:
-      - docker_username
-      - docker_token