diff --git a/.github/actions/setup-postgres-windows/action.yml b/.github/actions/setup-postgres-windows/action.yml
index 62ab7e40c9e..117a6b017a6 100644
--- a/.github/actions/setup-postgres-windows/action.yml
+++ b/.github/actions/setup-postgres-windows/action.yml
@@ -18,18 +18,17 @@ runs:
           --params "/Password:password" \
           --ia "--enable-components server,commandlinetools --extract-only 1" \
           --no-progress
-        cat "C:\Users\runneradmin\AppData\Local\Temp\chocolatey\install-postgresql.log"
 
         PG_BINDIR=$("$PROGRAMFILES/PostgreSQL/16/bin/pg_config.exe" --bindir)
         PG_LIBDIR=$("$PROGRAMFILES/PostgreSQL/16/bin/pg_config.exe" --libdir)
 
-        echo $PG_BINDIR
-        echo $PQ_LIB_DIR
+        echo "PG_BINDIR:$PG_BINDIR"
+        echo "PG_LIBDIR:$PG_LIBDIR"
 
         echo "$PG_BINDIR" >> $GITHUB_PATH
         echo "PQ_LIB_DIR=$PG_LIBDIR" >> $GITHUB_ENV
 
-        PGBIN="%ProgramFiles%\PostgreSQL\16\bin"
+        PGBIN=PG_BINDIR
         PGROOT="%ProgramFiles%\PostgreSQL\16"
         PGDATA="%ProgramFiles%\PostgreSQL\16\data"
 
@@ -37,12 +36,12 @@ runs:
         echo "PGROOT=$PGROOT" >> $GITHUB_ENV
         echo "PGDATA=$PGDATA" >> $GITHUB_ENV
 
-        ls $PG_BINDIR
+        echo "listing contents of PGROOT: $PGROOT"
+        ls $PGROOT
 
         echo "registering service using $PGBIN\pg_ctl.exe"
-        "$PGBIN\pg_ctl.exe" register -N "postgresql16" -D "%ProgramData%/db_data" -S auto
+        "$PGBIN\pg_ctl.exe" register -N "postgresql16" -D "%ProgramData%\data" -S auto
         "$PGBIN\initdb.exe -D "%ProgramFiles%\PostgreSQL\16\data"
-        "$PGBIN\pg_ctl.exe restart -D "%ProgramFiles%\PostgreSQL\16\data"
     - shell: pwsh
       run: |
         # $pgService = Get-Service -Name postgresql16