diff --git a/infra/dev/Makefile b/infra/dev/Makefile
index 488059686..f737cc52e 100644
--- a/infra/dev/Makefile
+++ b/infra/dev/Makefile
@@ -14,8 +14,11 @@ provision-postgres-docker:
 	@docker volume rm twenty_db_data || true
 	@docker compose up --build postgres -d
 
-provision-postgres-macos:
-	sh ./scripts/setup-postgres-macos.sh
+provision-postgres-macos-arm:
+	sh ./scripts/setup-postgres-macos-arm.sh
+
+provision-postgres-macos-intel:
+	sh ./scripts/setup-postgres-macos-intel.sh
 
 provision-postgres-linux:
 	sh ./scripts/setup-postgres-linux.sh
diff --git a/infra/dev/scripts/setup-postgres-linux.sh b/infra/dev/scripts/setup-postgres-linux.sh
index 3c68dad8b..14249c274 100755
--- a/infra/dev/scripts/setup-postgres-linux.sh
+++ b/infra/dev/scripts/setup-postgres-linux.sh
@@ -75,5 +75,5 @@ fi
 
 # Run the init.sql to setup database
 echo_header $GREEN "Step [4/4]: Setting up database..."
-cp ./infra/dev/postgres/init.sql /tmp/init.sql
+cp ./postgres/init.sql /tmp/init.sql
 sudo -u postgres psql -f /tmp/init.sql || handle_error "Failed to execute init.sql script."
diff --git a/infra/dev/scripts/setup-postgres-macos.sh b/infra/dev/scripts/setup-postgres-macos-arm.sh
similarity index 92%
rename from infra/dev/scripts/setup-postgres-macos.sh
rename to infra/dev/scripts/setup-postgres-macos-arm.sh
index b354ab7fe..97578c0b1 100755
--- a/infra/dev/scripts/setup-postgres-macos.sh
+++ b/infra/dev/scripts/setup-postgres-macos-arm.sh
@@ -61,12 +61,6 @@ brew reinstall postgresql@$PG_MAIN_VERSION
 # Install pg_graphql extensions
 echo_header $GREEN "Step [2/4]: Installing GraphQL for PostgreSQL..."
 
-# To force a reinstall of cargo-pgrx, pass --force to the command below
-curl https://sh.rustup.rs -sSf | sh
-source "$HOME/.cargo/env"
-cargo install --locked cargo-pgrx@$CARGO_PGRX_VERSION
-cargo pgrx init --pg$PG_MAIN_VERSION download
-
 # Uninstall existing Rust installation if found
 existing_rust_path=$(which rustc)
 if [ -n "$existing_rust_path" ]; then
@@ -74,10 +68,11 @@ if [ -n "$existing_rust_path" ]; then
     rm -rf "$existing_rust_path"
 fi
 
-curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-
-# Add Cargo's bin directory to PATH
-. "$HOME/.cargo/env"
+# To force a reinstall of cargo-pgrx, pass --force to the command below
+curl  https://sh.rustup.rs -sSf | sh
+source "$HOME/.cargo/env"
+cargo install --locked cargo-pgrx@$CARGO_PGRX_VERSION --force
+cargo pgrx init --pg$PG_MAIN_VERSION download
 
 # Create a temporary directory
 temp_dir=$(mktemp -d)
@@ -87,6 +82,8 @@ curl -LJO https://github.com/supabase/pg_graphql/archive/refs/tags/v$PG_GRAPHQL_
 
 unzip pg_graphql-$PG_GRAPHQL_VERSION.zip
 
+[[ ":$PATH:" != *":/opt/homebrew/opt/postgresql@$PG_MAIN_VERSION/bin:"* ]] && PATH="/opt/homebrew/opt/postgresql@$PG_MAIN_VERSION/bin:${PATH}"
+
 cd "pg_graphql-$PG_GRAPHQL_VERSION"
 cargo pgrx install --release --pg-config /opt/homebrew/opt/postgresql@$PG_MAIN_VERSION/bin/pg_config
 
@@ -98,7 +95,6 @@ rm -rf "$temp_dir"
 # Start postgresql service
 echo_header $GREEN "Step [3/4]: Starting PostgreSQL service..."
 
-[[ ":$PATH:" != *":/opt/homebrew/opt/postgresql@$PG_MAIN_VERSION/bin:"* ]] && PATH="/opt/homebrew/opt/postgresql@$PG_MAIN_VERSION/bin:${PATH}"
 
 if brew services start postgresql@$PG_MAIN_VERSION; then
     echo "PostgreSQL service started successfully."
@@ -108,5 +104,5 @@ fi
 
 # Run the init.sql to setup database
 echo_header $GREEN "Step [4/4]: Setting up database..."
-cp ./infra/dev/postgres/init.sql /tmp/init.sql
+cp ./postgres/init.sql /tmp/init.sql
 psql -f /tmp/init.sql -d postgres|| handle_error "Failed to execute init.sql script."
diff --git a/infra/dev/scripts/setup-postgres-macos-intel.sh b/infra/dev/scripts/setup-postgres-macos-intel.sh
new file mode 100755
index 000000000..4848485e8
--- /dev/null
+++ b/infra/dev/scripts/setup-postgres-macos-intel.sh
@@ -0,0 +1,108 @@
+#!/bin/bash
+
+# Colors
+RED=31
+GREEN=32
+BLUE=34
+
+# Function to display colored output
+function echo_header {
+    COLOR=$1
+    MESSAGE=$2
+    echo -e "\e[${COLOR}m\n=======================================================\e[0m"
+    echo -e "\e[${COLOR}m${MESSAGE}\e[0m"
+    echo -e "\e[${COLOR}m=======================================================\e[0m"
+}
+
+# Function to handle errors
+function handle_error {
+    echo_header $RED "Error: $1"
+    exit 1
+}
+
+cat << "EOF"
+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+@@@@@@@#*+=================@@@@@%*+=========++*%@@@@@@@
+@@@@#-                   .+@@%=.                .+@@@@@
+@@@-                   .*@@%-                     .#@@@
+@@=     .=+++++++++++*#@@@=       -++++++++++-      %@@
+@@.     %@@@@@@@@@@@@@@@+       =%@@@@@@@@@@@@=     +@@
+@@.    .@@@@@@@@@@@@@@+.      -%@@@@@@@@@@@@@@+     +@@
+@@.    .@@@@@@@@@@@@*.      -#@@#:=@@@@@@@@@@@=     +@@
+@@      @@@@@@@@@@#:      :#@@#:  -@@@@@@@@@@@=     +@@
+@@#====#@@@@@@@@#-      .*@@@=    -@@@@@@@@@@@=     +@@
+@@@@@@@@@@@@@@%-      .*@@@@#     -@@@@@@@@@@@=     +@@
+@@@@@@@@@@@@%=       +@@@@@@#     -@@@@@@@@@@@=     +@@
+@@@@@@@@@@@+       =@@@@@@@@#     -@@@@@@@@@@@=     +@@
+@@@@@@@@@+.      -%@@@@@@@@@#     -@@@@@@@@@@@=     +@@
+@@@@@@@*.      -%@@@@@@@@@@@#     -@@@@@@@@@@@=     +@@
+@@@@@#:      :#@@@@@@@@@@@@@#     -@@@@@@@@@@@+     +@@
+@@@#:      :#@@@@@@@@@@@@@@@#     :@@@@@@@@@@@=     +@@
+@@=       :+*+++++++++++*%@@@.     :+++++++++-      %@@
+@@                       :@@@%.                   .#@@@
+@@-                      :@@@@@+:               .+@@@@@
+@@@#+===================+%@@@@@@@%*++=======++*%@@@@@@@
+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+EOF
+
+echo_header $BLUE "                    DATABASE SETUP"
+
+PG_MAIN_VERSION=15
+PG_GRAPHQL_VERSION=1.3.0
+CARGO_PGRX_VERSION=0.9.8
+
+current_directory=$(pwd)
+
+# Install PostgresSQL
+echo_header $GREEN "Step [1/4]: Installing PostgreSQL..."
+
+brew reinstall postgresql@$PG_MAIN_VERSION
+
+# Install pg_graphql extensions
+echo_header $GREEN "Step [2/4]: Installing GraphQL for PostgreSQL..."
+
+# Uninstall existing Rust installation if found
+existing_rust_path=$(which rustc)
+if [ -n "$existing_rust_path" ]; then
+    echo "Uninstalling existing Rust installation..."
+    rm -rf "$existing_rust_path"
+fi
+
+# To force a reinstall of cargo-pgrx, pass --force to the command below
+curl  https://sh.rustup.rs -sSf | sh
+source "$HOME/.cargo/env"
+cargo install --locked cargo-pgrx@$CARGO_PGRX_VERSION --force
+cargo pgrx init --pg$PG_MAIN_VERSION download
+
+# Create a temporary directory
+temp_dir=$(mktemp -d)
+cd "$temp_dir"
+
+curl -LJO https://github.com/supabase/pg_graphql/archive/refs/tags/v$PG_GRAPHQL_VERSION.zip || handle_error "Failed to download pg_graphql package."
+
+unzip pg_graphql-$PG_GRAPHQL_VERSION.zip
+
+[[ ":$PATH:" != *":/usr/local/opt/postgresql@$PG_MAIN_VERSION/bin:"* ]] && PATH="/usr/local/opt/postgresql@$PG_MAIN_VERSION/bin:${PATH}"
+
+cd "pg_graphql-$PG_GRAPHQL_VERSION"
+cargo pgrx install --release --pg-config /usr/local/opt/postgresql@$PG_MAIN_VERSION/bin/pg_config
+
+# # Clean up the temporary directory
+echo "Cleaning up..."
+cd "$current_directory"
+rm -rf "$temp_dir"
+
+# Start postgresql service
+echo_header $GREEN "Step [3/4]: Starting PostgreSQL service..."
+
+
+if brew services start postgresql@$PG_MAIN_VERSION; then
+    echo "PostgreSQL service started successfully."
+else
+    handle_error "Failed to start PostgreSQL service."
+fi
+
+# Run the init.sql to setup database
+echo_header $GREEN "Step [4/4]: Setting up database..."
+cp ./postgres/init.sql /tmp/init.sql
+psql -f /tmp/init.sql -d postgres|| handle_error "Failed to execute init.sql script."