diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/build-and-test.yml
similarity index 74%
rename from .github/workflows/dotnet-core.yml
rename to .github/workflows/build-and-test.yml
index 0627456..678a9f5 100644
--- a/.github/workflows/dotnet-core.yml
+++ b/.github/workflows/build-and-test.yml
@@ -1,4 +1,4 @@
-name: Build And Test
+name: Build and Test
 
 on:
   push:
@@ -14,10 +14,10 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Setup .NET Core
-        uses: actions/setup-dotnet@v1
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: '7.0.x'
+          dotnet-version: 8.x
 
       - name: Install dependencies
         run: dotnet restore
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1acc0b3..592d5b2 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -4,32 +4,34 @@ on:
     branches:
       - release/* # Default release branch
 jobs:
+  
   publish:
     name: build, pack & publish
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - name: Setup .NET Core
-        uses: actions/setup-dotnet@v1
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: '7.0.x'
+          dotnet-version: 8.x
 
       - name: Wait for tests to succeed
-        uses: lewagon/wait-on-check-action@v1.0.0
+        uses: lewagon/wait-on-check-action@v1.3.1
         with:
           ref: ${{ github.ref }}
-          check-name: "buildAndTest"
+          check-name: build-and-test
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           wait-interval: 10
 
-      - name: Install dependencies
+      - name: Restore dependencies
         run: dotnet restore
 
-      - name: Build Core
+      - name: Build
         run: dotnet build ./Core/Core.csproj --configuration Release --no-restore
 
-      # Publish
-      - name: publish on version change
-        run: nuget push "**/*.nupkg" -Source 'https://api.nuget.org/v3/index.json' -ApiKey ${{secrets.NUGET_API_KEY}}
-      
+      - name: Generate package
+        run: dotnet pack ./Core/Core.csproj --configuration Release
+
+      - name: Publish on version change
+        run: dotnet nuget push "**/*.nupkg" --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NUGET_API_KEY }}
\ No newline at end of file
diff --git a/Core/Core.csproj b/Core/Core.csproj
index 46a6b7e..67089a3 100644
--- a/Core/Core.csproj
+++ b/Core/Core.csproj
@@ -1,45 +1,41 @@
-<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
-        <AssemblyName>Supabase.Core</AssemblyName>
-        <RootNamespace>Supabase.Core</RootNamespace>
-        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-        <TargetFramework>netstandard2.0</TargetFramework>
-        <PackOnBuild>true</PackOnBuild>
-        <PackageId>supabase-core</PackageId>
-        <Authors>Joseph Schultz &lt;joseph@acupofjose.com&gt;</Authors>
-        <Copyright>MIT</Copyright>
-        <NeutralLanguage>en</NeutralLanguage>
-        <Owners>Joseph Schultz &lt;joseph@acupofjose.com&gt;</Owners>
-        <Summary>Shared core for supabase-csharp</Summary>
-        <Title>Supabase Core</Title>
-        <Description>Shared core for supabase-csharp</Description>
-        <PackageIconUrl>https://avatars.githubusercontent.com/u/54469796?s=200&amp;v=4</PackageIconUrl>
-        <PackageLicenseExpression>MIT</PackageLicenseExpression>
-        <PackageProjectUrl>https://github.com/supabase-community/core-csharp</PackageProjectUrl>
-        <RepositoryUrl>https://github.com/supabase-community/core-csharp</RepositoryUrl>
-        <RepositoryType>git</RepositoryType>
-        <PackageTags>supabase, core</PackageTags>
-        <PackageIcon>icon.png</PackageIcon>
-        <PackageReadmeFile>README.md</PackageReadmeFile>
-        <PackageVersion>0.0.3</PackageVersion>
-        <ReleaseVersion>0.0.3</ReleaseVersion>
-    </PropertyGroup>
-    <PropertyGroup>
-        <IncludeSymbols>true</IncludeSymbols>
-        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    </PropertyGroup>
-    <PropertyGroup>
-        <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    </PropertyGroup>
-    <PropertyGroup>
-        <Nullable>enable</Nullable>
-        <LangVersion>8.0</LangVersion>
-        <WarningsAsErrors>CS8600;CS8602;CS8603</WarningsAsErrors>
-    </PropertyGroup>
-    <ItemGroup>
-        <None Include="..\.github\icon.png" Pack="true" Link="icon.png" PackagePath="\" />
-        <None Include="..\README.md" Pack="true" Link="README.md" PackagePath="\" />
-    </ItemGroup>
+	<PropertyGroup>
+		<TargetFramework>netstandard2.0</TargetFramework>
+		<PackOnBuild>true</PackOnBuild>
+		<PackageId>Supabase.Core</PackageId>
+		<Authors>Joseph Schultz &lt;joseph@acupofjose.com&gt;</Authors>
+		<Copyright>MIT</Copyright>
+		<NeutralLanguage>en</NeutralLanguage>
+		<Owners>Joseph Schultz &lt;joseph@acupofjose.com&gt;</Owners>
+		<Summary>Shared core for supabase-csharp</Summary>
+		<Title>Supabase Core</Title>
+		<Description>Shared core for Supabase.*</Description>
+		<AssemblyName>Supabase.Core</AssemblyName>
+		<RootNamespace>Supabase.Core</RootNamespace>
+		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+		<PackageIcon>icon.png</PackageIcon>
+		<PackageReadmeFile>README.md</PackageReadmeFile>
+		<PackageIconUrl>https://avatars.githubusercontent.com/u/54469796?s=200&amp;v=4</PackageIconUrl>
+		<PackageLicense>https://github.com/supabase-community/core-csharp/blob/master/LICENSE</PackageLicense>
+		<PackageProjectUrl>https://github.com/supabase-community/core-csharp</PackageProjectUrl>
+		<PackageTags>supabase, core</PackageTags>
+		<RepositoryUrl>https://github.com/supabase-community/core-csharp</RepositoryUrl>
+		<RepositoryType>git</RepositoryType>
+		<PackageVersion>0.0.2</PackageVersion>
+		<ReleaseVersion>0.0.2</ReleaseVersion>
+		<IncludeSymbols>true</IncludeSymbols>
+		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
+		<GenerateDocumentationFile>true</GenerateDocumentationFile>
+	</PropertyGroup>
+	
+	<PropertyGroup>
+		<Nullable>enable</Nullable>
+		<LangVersion>8.0</LangVersion>
+		<WarningsAsErrors>CS8600;CS8602;CS8603</WarningsAsErrors>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<None Include="..\.github\icon.png" Pack="true" Link="icon.png" PackagePath="\" />
+		<None Include="..\README.md" Pack="true" Link="README.md" PackagePath="\" />
+	</ItemGroup>
 </Project>
diff --git a/README.md b/README.md
index 7085808..434d18b 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,8 @@
   </a>
 </p>
 
-This repo contains shared resources for the [supabase-csharp](https://github.com/supabase-community/supabase-csharp) repo and its dependent libraries.
+This repo contains shared resources for the [supabase-csharp](https://github.com/supabase-community/supabase-csharp)
+repo and its dependent libraries.
 
 ## Package made possible through the efforts of: