diff --git a/.github/workflows/internal-archive-release.yml b/.github/workflows/internal-archive-release.yml
index 2047797..f064088 100644
--- a/.github/workflows/internal-archive-release.yml
+++ b/.github/workflows/internal-archive-release.yml
@@ -82,17 +82,32 @@ jobs:
         with:
           python-version: ${{ env.PYTHON_TARGET_VERSION }}
 
+      ###################
+      # Testing with Tox
+      ###################
       - name: "Install Python Dependencies"
+        if: contains(fromJSON('["redshift"]'), inputs.dbms_name)
         run: |
           python -m pip install --user --upgrade pip
           python -m pip install tox
           python -m pip --version
           python -m tox --version
 
-      - name: "Run Tox"
+      - name: "Run Tests using tox"
         if: contains(fromJSON('["redshift"]'), inputs.dbms_name)
         run: tox
 
+      #####################
+      # Testing with Hatch
+      #####################
+      - name: "Setup `hatch`"
+        if: contains(fromJSON('["postgres"]'), inputs.dbms_name)
+        uses: dbt-labs/dbt-adapters/.github/actions/setup-hatch@main
+
+      - name: "Run Tests using hatch"
+        if: contains(fromJSON('["postgres"]'), inputs.dbms_name)
+        run: hatch run unit-tests:all
+
   run-integration-tests:
     runs-on: ubuntu-latest
     needs: [job-setup]
@@ -106,8 +121,9 @@ jobs:
         with:
           ref: ${{ inputs.sha || 'main' }}
 
-      # - name: "Setup Environment Variables - ./scripts/env-setup.sh"
-      #   run: source ./scripts/env-setup.sh
+      - name: "Setup Environment Variables - ./scripts/env-setup.sh"
+        if: contains(fromJSON('["redshift"]'), inputs.dbms_name)
+        run: source ./scripts/env-setup.sh
 
       - name: "Setup Environment Variables - Secrets Context"
         uses: actions/github-script@v7
@@ -135,12 +151,17 @@ jobs:
         env:
           SECRETS_CONTEXT: ${{ toJson(secrets) }}
 
+
       - name: "Set up Python - ${{ env.PYTHON_TARGET_VERSION }}"
         uses: actions/setup-python@v5
         with:
           python-version: ${{ env.PYTHON_TARGET_VERSION }}
 
-      - name: "Install python tools"
+      ###################
+      # Testing with Tox
+      ###################
+      - name: "Install Python Dependencies"
+        if: contains(fromJSON('["redshift"]'), inputs.dbms_name)
         run: |
           python -m pip install --user --upgrade pip
           python -m pip --version
@@ -151,6 +172,18 @@ jobs:
         if: contains(fromJSON('["redshift"]'), inputs.dbms_name)
         run: tox
 
+      #####################
+      # Testing with Hatch
+      #####################
+
+      - name: "Setup `hatch`"
+        if: contains(fromJSON('["postgres"]'), inputs.dbms_name)
+        uses: dbt-labs/dbt-adapters/.github/actions/setup-hatch@main
+
+      - name: "Run Tests using hatch"
+        if: contains(fromJSON('["postgres"]'), inputs.dbms_name)
+        run: hatch run integration-tests:all
+
   create-internal-release:
     name: Create release for internal archive
     runs-on: ubuntu-latest
@@ -219,7 +252,7 @@ jobs:
       #
       # 2. Build with Hatch
       #
-      - name: Setup `hatch`
+      - name: "Setup `hatch`"
         if: contains(fromJSON('["postgres"]'), inputs.dbms_name)
         uses: dbt-labs/dbt-adapters/.github/actions/setup-hatch@main