diff --git a/ci_scripts/configure-tde-server.sh b/ci_scripts/configure-tde-server.sh
index 9217977bb9f..30f4eda9afd 100644
--- a/ci_scripts/configure-tde-server.sh
+++ b/ci_scripts/configure-tde-server.sh
@@ -23,15 +23,11 @@ if [ -d "$PGDATA" ]; then
     rm -rf "$PGDATA"
 fi
 
-initdb -D "$PGDATA"
-
-echo "shared_preload_libraries ='pg_tde'" >> "$PGDATA/postgresql.conf"
+initdb -D "$PGDATA" --set shared_preload_libraries=pg_tde
 
 pg_ctl -D "$PGDATA" start
 
 createdb setup_helper
-psql setup_helper < "$SCRIPT_DIR/tde_setup_global.sql"
-
-echo "pg_tde.wal_encrypt = on" >> "$PGDATA/postgresql.conf"
+psql setup_helper -f "$SCRIPT_DIR/tde_setup_global.sql"
 
 pg_ctl -D "$PGDATA" restart
diff --git a/ci_scripts/tde_setup_global.sql b/ci_scripts/tde_setup_global.sql
index 617ba069e95..ab45d185611 100644
--- a/ci_scripts/tde_setup_global.sql
+++ b/ci_scripts/tde_setup_global.sql
@@ -2,5 +2,6 @@ CREATE EXTENSION IF NOT EXISTS pg_tde;
 SELECT pg_tde_add_key_provider_file('PG_TDE_GLOBAL', 'reg_file-global', '/tmp/pg_tde_test_keyring.per');
 SELECT pg_tde_set_server_principal_key('global-principal-key', 'PG_TDE_GLOBAL', 'reg_file-global');
 SELECT pg_tde_create_wal_key();
-ALTER SYSTEM SET default_table_access_method='tde_heap';
+ALTER SYSTEM SET pg_tde.wal_encrypt = on;
+ALTER SYSTEM SET default_table_access_method = 'tde_heap';
 -- restart required