diff --git a/.github/workflows/test-cli-with-database.yml b/.github/workflows/test-cli-with-database.yml
index 5593dea2ec..baa02cb97b 100644
--- a/.github/workflows/test-cli-with-database.yml
+++ b/.github/workflows/test-cli-with-database.yml
@@ -58,38 +58,37 @@ jobs:
         run: npm i -g @medusajs/medusa-cli
 
       - name: Create Medusa project
-        # TODO: Remove the branch when typeorm is no longer a dependency for starter
         run: |
-          medusa new cli-test 'https://github.com/medusajs/medusa-starter-default/tree/typeorm-upgrade'
+          medusa new cli-test
         working-directory: ..
 
-      - name: Install postgres config
-        if: matrix.db == 'postgres'
-        run: |
-          curl \
-          https://raw.githubusercontent.com/medusajs/medusa-starter-default/feat/postgres-config/medusa-config.js \
-          --output medusa-config.js
-        working-directory: ../cli-test
-
       - name: run medusa dev
         run: medusa-dev --force-install
         working-directory: ../cli-test
 
       - name: Run migrations
+        env:
+          DATABASE_TYPE: ${{ matrix.db }}
         run: medusa migrations run
         working-directory: ../cli-test
 
       - name: Seed db
+        env:  
+          DATABASE_TYPE: ${{ matrix.db }}
         run: yarn seed
         working-directory: ../cli-test
 
       - name: Create admin user
+        env:  
+          DATABASE_TYPE: ${{ matrix.db }}
         run: medusa user -e test@test.com -p password -i admin_123
         working-directory: ../cli-test
 
       ##########################  Test medusa develop  ###############################
 
       - name: Run development server
+        env:  
+          DATABASE_TYPE: ${{ matrix.db }}
         run: medusa develop &
         working-directory: ../cli-test
 
@@ -99,8 +98,10 @@ jobs:
       ###########################  Test medusa start  ################################
 
       - name: Starting medusa
+        env:  
+          DATABASE_TYPE: ${{ matrix.db }}
         run: medusa start &
         working-directory: ../cli-test
 
       - name: Testing server
-        uses: ./.github/actions/test-server
+        uses: ./.github/actions/test-server
\ No newline at end of file