diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
new file mode 100644
index 0000000..6f8b1d2
--- /dev/null
+++ b/.github/workflows/build-release.yml
@@ -0,0 +1,49 @@
+name: Build and Release
+
+on:
+  push:
+    tags:
+      - "v*.*.*"
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: write # Allows the action to create and write to the release
+    
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: autogen
+      run: autoreconf --install --force
+
+    - name: Install dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y libssh-dev libsystemd-dev
+          
+    - name: configure
+      run: ./configure
+
+    - name: Run make
+      run: make
+
+    - name: Run check
+      run: make check
+
+    - name: Run distcheck
+      run: make distcheck
+
+    - name: Create Release and Upload Assets
+      uses: softprops/action-gh-release@v2
+      with:
+        draft: true
+        prerelease: true
+        files: |
+          lbbs-*.tar.gz
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index b9c32b6..3addb56 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -2,7 +2,9 @@ name: Docker Image CI
 
 on:
   push:
-    branches: [ "main" ]
+    branches:
+      - "main"
+      - "v*.*"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 1a674df..41f7cc2 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -10,8 +10,9 @@
 name: Publish Docker image
 
 on:
-  release:
-    types: [published]
+  push:
+    tags:
+      - "v*.*.*"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -60,6 +61,8 @@ jobs:
           context: .
           file: ./Dockerfile/dockerfile.bbsd
           push: true
+          provenance: true
+          sbom: true
           tags: |
             ${{ env.BBSD_IMAGE }}:${{ github.ref_name }}
             ${{ env.BBSD_IMAGE }}:latest
diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml
index ff7e6bf..9ed3d8f 100644
--- a/.github/workflows/makefile.yml
+++ b/.github/workflows/makefile.yml
@@ -2,9 +2,12 @@ name: Makefile CI
 
 on:
   push:
-    branches: [ "v1.7" ]
+    branches:
+      - "main"
+      - "v*.*"
   pull_request:
-    branches: [ "v1.7" ]
+    branches:
+      - "main"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}