diff --git a/.github/workflows/build-docfx.yaml b/.github/workflows/build-docfx.yaml
deleted file mode 100644
index 541f94a..0000000
--- a/.github/workflows/build-docfx.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-name: Deploy docs
-
-on:
-  push:
-    branches:
-      - master
-  
-jobs:
-  hello_world_job:
-    runs-on: ubuntu-latest
-    name: Docs build & deploy
-    steps:
-      - uses: actions/checkout@v2
-        name: Checkout 🛎
-      - run: "rm .gitignore && ls ."
-        name: Remove .gitignore file
-      - uses: nikeee/docfx-action@master
-        name: Build Docs 📚
-        with:
-          args: docfx_project/docfx.json
-      - name: Deploy 🚀
-        uses: JamesIves/github-pages-deploy-action@releases/v3
-        with:
-          BRANCH: gh-pages # The branch the action should deploy to.
-          FOLDER: docs/ # The folder the action should deploy.
- 
\ No newline at end of file
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
new file mode 100644
index 0000000..76217ef
--- /dev/null
+++ b/.github/workflows/build-test.yml
@@ -0,0 +1,26 @@
+name: .NET Core
+
+on:
+  push:
+    branches: [ master, develop ]
+  pull_request:
+    branches: [ master, develop ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: 🛎 Checkout repo
+      uses: actions/checkout@v2
+    - name: 🚧 Setup .NET Core
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 3.1.101
+    - name: ⚙️ Install dependencies
+      run: dotnet restore
+    - name: 🏗 Build
+      run: dotnet build --configuration Release --no-restore
+    - name: 🧪 Test
+      run: dotnet test --no-restore --verbosity normal
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
new file mode 100644
index 0000000..8d34200
--- /dev/null
+++ b/.github/workflows/deploy.yaml
@@ -0,0 +1,50 @@
+name: Deploy docs
+
+on:
+  push:
+    tags:
+      - v*
+
+jobs:
+  build_and_publish:
+    runs-on: ubuntu-latest
+    steps:
+      - name: 🛎 Checkout repo
+        uses: actions/checkout@v2
+      - name: 🚧 Setup .NET Core
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 3.1.101
+          source-url: https://nuget.pkg.github.com/Paramdigma/index.json
+        env:
+          NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
+      - name: ⚙️ Install dependencies
+        run: dotnet restore
+      - name: 🏗 Build
+        run: dotnet build --configuration Release --no-restore
+      - name: 🧪 Test
+        run: dotnet test --no-restore --verbosity normal
+      - name: 📦 Create the package
+        run: dotnet pack --configuration Release src/Paramdigma.Core.csproj
+      - name: 🚀 Publish the package to GPR
+        run: dotnet nuget push src/bin/Release/*.nupkg
+
+  deploy_docs:
+    runs-on: ubuntu-latest
+    name: Docs build & deploy
+    needs: build_and_publish
+    steps:
+      - uses: actions/checkout@v2
+        name: 🛎 Checkout
+      - run: "rm .gitignore && ls ."
+        name: 🗑 Remove .gitignore file
+      - uses: nikeee/docfx-action@master
+        name: 📚 Build Docs
+        with:
+          args: docfx_project/docfx.json
+      - name: 🚀 Deploy
+        uses: JamesIves/github-pages-deploy-action@releases/v3
+        with:
+          BRANCH: gh-pages # The branch the action should deploy to.
+          FOLDER: docs/ # The folder the action should deploy.
+ 
\ No newline at end of file