diff --git a/.gitea/workflows/demo.yml b/.gitea/workflows/demo.yml
index 394c807..693a87d 100644
--- a/.gitea/workflows/demo.yml
+++ b/.gitea/workflows/demo.yml
@@ -1,6 +1,6 @@
 name: Gitea Actions Demo
 run-name: ${{ gitea.actor }} is testing out Gitea Actions 🚀
-on: [push]
+on: [discussion]
 
 jobs:
   Explore-Gitea-Actions:
diff --git a/.gitea/workflows/push.yml b/.gitea/workflows/push.yml
index 7a7cc8e..6adf738 100644
--- a/.gitea/workflows/push.yml
+++ b/.gitea/workflows/push.yml
@@ -1,5 +1,4 @@
-name: Gitea Actions Demo
-run-name: ${{ gitea.actor }} is testing out Gitea Actions 🚀
+name: Push/PR Steps
 on:
   pull_request:
     branches:
@@ -11,22 +10,38 @@ on:
     tags:
       - 'v*'
 
-
-
 jobs:
   Lint:
-    runs-on: mingc/android-build-box:latest
+    runs-on: ubuntu-latest
     steps:
       - name: Check out repository code
         uses: actions/checkout@v4
-      - run: echo "---------------------------------------------------------"
-      - run: echo "Install linters..."
-      - run: curl -sSLO https://github.com/pinterest/ktlint/releases/download/1.0.0/ktlint && chmod a+x ktlint && mv ktlint /usr/local/bin/
-      - run: curl -sSLO https://github.com/detekt/detekt/releases/download/v1.23.1/detekt-cli-1.23.1.zip && unzip detekt-cli-1.23.1.zip
-      - run: echo "---------------------------------------------------------"
-      - run: echo "Linting..."
-      - run: ktlint 'shared/**/*.kt' 'androidApp/**/*.kt' '!shared/build' || true
-      - run: echo "---------------------------------------------------------"
-      - run: echo "Detecting..."
-      - run: ./detekt-cli-1.23.1/bin/detekt-cli --all-rules --excludes '**/shared/build/**/*.kt' || true
-      - run: echo "---------------------------------------------------------"
\ No newline at end of file
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin' # See 'Supported distributions' for available options
+          java-version: '17'
+      - name: Install klint
+        run: curl -sSLO https://github.com/pinterest/ktlint/releases/download/1.0.0/ktlint && chmod a+x ktlint && mv ktlint /usr/local/bin/
+      - name: Install detekt
+        run: curl -sSLO https://github.com/detekt/detekt/releases/download/v1.23.1/detekt-cli-1.23.1.zip && unzip detekt-cli-1.23.1.zip
+      - name: Linting...
+        run: ktlint 'shared/**/*.kt' 'androidApp/**/*.kt' '!shared/build' || true
+      - name: Detecting...
+        run: ./detekt-cli-1.23.1/bin/detekt-cli --all-rules --excludes '**/shared/build/**/*.kt' || true
+
+  BuildAndTest:
+    runs-on: ubuntu-latest
+    needs: Lint
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin' # See 'Supported distributions' for available options
+          java-version: '17'
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v3
+      - name: Configure gradle...
+        run: mkdir -p ~/.gradle && echo "org.gradle.daemon=false\nignoreGitVersion=true\nsystemProp.org.gradle.internal.http.connectionTimeout=180000\nsystemProp.org.gradle.internal.http.socketTimeout=180000" >> ~/.gradle/gradle.properties
+      - name: Build and test
+        run: ./gradlew build --scan
diff --git a/.gitea/workflows/tag.yml b/.gitea/workflows/tag.yml
new file mode 100644
index 0000000..3c693be
--- /dev/null
+++ b/.gitea/workflows/tag.yml
@@ -0,0 +1,19 @@
+name: Tag
+on: workflow_dispatch
+
+jobs:
+  createTagAndChangelog:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+      - name: Creating the tag
+        uses: |
+          PREV=$(git describe --tags --abbrev=0)
+          ./build.sh --publish --from-ci
+      - name: Generating changelog
+        uses: |
+          VER=$(git describe --tags --abbrev=0)
+          CHANGELOG=$(git log $PREV..HEAD --pretty="- %s")
+          echo "**$VER**\n\n$CHANGELOG\n\n--------------------------------------------------------------------\n\n$(cat CHANGELOG.md)" > CHANGELOG.md
+          git diff
\ No newline at end of file