diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 10fd1aa2..e01fd3ac 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -16,23 +16,23 @@ permissions:
 
 jobs:
   golang_quality:
-    uses: CubicrootXYZ/Workflows/.github/workflows/golang_quality.yaml@v0.0.11
+    uses: CubicrootXYZ/Workflows/.github/workflows/golang_quality.yaml@v0.0.12
 
   golang_test:
-    uses: CubicrootXYZ/Workflows/.github/workflows/golang_test.yaml@v0.0.11
+    uses: CubicrootXYZ/Workflows/.github/workflows/golang_test.yaml@v0.0.12
     needs: [build_openapi_spec] # Validates agains OpenAPI spec
     with:
       services: '{"database": {"image": "mysql:9.0", "ports": ["3306:3306"], "env": {"MYSQL_ROOT_PASSWORD": "mypass", "MYSQL_DATABASE": "remindme"}}}'
       env: '{"TEST_DB_HOST": "database"}'
 
   build_openapi_spec:
-    uses: CubicrootXYZ/Workflows/.github/workflows/openapi2_golang_build.yaml@v0.0.11
+    uses: CubicrootXYZ/Workflows/.github/workflows/openapi2_golang_build.yaml@v0.0.12
     with:
       entrypoint: cmd/remindme/main.go
 
   render_openapi_spec:
     needs: [build_openapi_spec]
-    uses: CubicrootXYZ/Workflows/.github/workflows/openapi2_render.yaml@v0.0.11
+    uses: CubicrootXYZ/Workflows/.github/workflows/openapi2_render.yaml@v0.0.12
     with:
       spec_artifact_name: openapi-spec
       spec_artifact_path: docs/
@@ -40,30 +40,19 @@ jobs:
 
   deploy_openapi_spec:
     needs: [render_openapi_spec]
-    uses: CubicrootXYZ/Workflows/.github/workflows/pages.yaml@v0.0.11
+    uses: CubicrootXYZ/Workflows/.github/workflows/pages.yaml@v0.0.12
     with:
       artifact_name: rendered-api-docu
       artifact_path: index.html
 
-  build_and_push_image:
+  build_image:
     needs: [golang_test, golang_quality, render_openapi_spec]
-    runs-on: ubuntu-latest
-    if: "!startsWith(github.ref, 'refs/tags/')"
-    steps:
-      - name: Checkout the repository
-        uses: actions/checkout@v3
-      - name: Build container
-        run: docker build --build-arg VERSION=${{ github.sha }} -t cubicrootxyz/remindme:beta .
-      - name: Login to Docker Hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Push development image
-        if: "${{ github.ref != 'refs/heads/main' }}"
-        run: |
-          docker tag cubicrootxyz/remindme:beta cubicrootxyz/remindme:${{ github.sha }}
-          docker push cubicrootxyz/remindme:${{ github.sha }}
-      - name: Push beta image
-        if: "${{ github.ref == 'refs/heads/main' }}"
-        run: docker push cubicrootxyz/remindme:beta
+    uses: CubicrootXYZ/Workflows/.github/workflows/build_image.yaml@v0.0.12
+    with:
+      docker_build_args: "--no-cache"
+      docker_file_path: "./"
+      image_name: "cubicrootxyz/remindme"
+      static_tag: "beta"
+    secrets:
+      dockerhub_user: ${{ secrets.DOCKERHUB_USERNAME }}
+      dockerhub_token: ${{ secrets.DOCKERHUB_TOKEN }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
deleted file mode 100644
index e60a498b..00000000
--- a/.github/workflows/release.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-name: Release
-on:
-  release:
-    types: [published]
-
-jobs:
-  # Builds the image and publishes it on docker hub
-  build_and_push_docker:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout the repository
-        uses: actions/checkout@v3
-      - name: Build container
-        run: docker build --build-arg VERSION=${{ github.ref_name }} -t cubicrootxyz/remindme:latest .
-      - name: Login to Docker Hub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Push image (latest)
-        run: docker push cubicrootxyz/remindme:latest
-      - name: Tag image with version
-        run: docker tag cubicrootxyz/remindme:latest cubicrootxyz/remindme:${{ github.event.release.tag_name }}
-      - name: Push image (version)
-        run: docker push cubicrootxyz/remindme:${{ github.event.release.tag_name }}