diff --git a/.gitea/workflows/build-image.yml b/.gitea/workflows/build-image.yml
index 9f2032d..f4e582b 100644
--- a/.gitea/workflows/build-image.yml
+++ b/.gitea/workflows/build-image.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - 'release/**'
+      - 'develop'
 
 jobs:
   build:
@@ -12,15 +13,24 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Extract version from package.json
-        id: version
+      - name: Compute image tags
+        id: meta
         run: |
           VERSION=$(node -p "require('./package.json').version")
           BRANCH=${GITHUB_REF#refs/heads/}
-          RELEASE_NAME=${BRANCH#release/}
           echo "version=${VERSION}" >> $GITHUB_OUTPUT
-          echo "release=${RELEASE_NAME}" >> $GITHUB_OUTPUT
-          echo "Building version ${VERSION} from branch ${BRANCH}"
+
+          if [ "$BRANCH" = "develop" ]; then
+            echo "tags=reg.i3omb.com/sofarr:develop" >> $GITHUB_OUTPUT
+            echo "Building develop image (version ${VERSION})"
+          else
+            RELEASE_NAME=${BRANCH#release/}
+            TAGS="reg.i3omb.com/sofarr:${VERSION}"
+            TAGS="${TAGS},reg.i3omb.com/sofarr:${RELEASE_NAME}"
+            TAGS="${TAGS},reg.i3omb.com/sofarr:latest"
+            echo "tags=${TAGS}" >> $GITHUB_OUTPUT
+            echo "Building release image ${VERSION} from branch ${BRANCH}"
+          fi
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -34,10 +44,7 @@ jobs:
           context: .
           push: true
           platforms: linux/amd64,linux/arm64,linux/arm/v7
-          tags: |
-            reg.i3omb.com/sofarr:${{ steps.version.outputs.version }}
-            reg.i3omb.com/sofarr:${{ steps.version.outputs.release }}
-            reg.i3omb.com/sofarr:latest
+          tags: ${{ steps.meta.outputs.tags }}
           labels: |
-            org.opencontainers.image.version=${{ steps.version.outputs.version }}
+            org.opencontainers.image.version=${{ steps.meta.outputs.version }}
             org.opencontainers.image.created=${{ github.event.head_commit.timestamp }}