diff --git a/frontend/src/app/components/audit/info-dialog/info-dialog.component.html b/frontend/src/app/components/audit/info-dialog/info-dialog.component.html
index 441626352..252b8f2b1 100644
--- a/frontend/src/app/components/audit/info-dialog/info-dialog.component.html
+++ b/frontend/src/app/components/audit/info-dialog/info-dialog.component.html
@@ -1,6 +1,6 @@
 <h1 mat-dialog-title>Log details</h1>
 <mat-dialog-content>
-    <p class="mat-body-1" data-block="preamble" data-hj-suppress>
+    <p class="mat-body-1" data-block="preamble" data-ph-no-capture>
       {{ log.User }} {{ action }} in "{{ normalizedTableName }}" table on {{formattedCrreatedAt}} {{ log.Status }}.
     </p>
 
@@ -10,10 +10,10 @@ <h1 mat-dialog-title>Log details</h1>
             class="mat-body"
             [ngClass]="{changed: isChangedFiled(field)}">
             <th>{{filedsNames[field]}}</th>
-            <td data-hj-suppress *ngIf="log.currentValue[field] !== '* * * sensitive data, no logs stored * * *'">
+            <td data-ph-no-capture *ngIf="log.currentValue[field] !== '* * * sensitive data, no logs stored * * *'">
               {{log.prevValue[field]}}
             </td>
-            <td data-hj-suppress
+            <td data-ph-no-capture
               [attr.colspan]="log.currentValue[field] === '* * * sensitive data, no logs stored * * *' ? '2' : '' "
               [ngClass]="{sensitive: log.currentValue[field] === '* * * sensitive data, no logs stored * * *'}">
               <div class="updated-cell">
@@ -35,7 +35,7 @@ <h1 mat-dialog-title>Log details</h1>
           class="mat-body"
           [ngClass]="{changed: isChangedFiled(field)}">
           <th>{{filedsNames[field.key]}}</th>
-          <td data-hj-suppress *ngIf="log.currentValue[field] !== '* * * sensitive data, no logs stored * * *'">
+          <td data-ph-no-capture *ngIf="log.currentValue[field] !== '* * * sensitive data, no logs stored * * *'">
             {{field.value}}
           </td>
         </tr>
diff --git a/frontend/src/app/components/charts/chart-edit/chart-edit.component.html b/frontend/src/app/components/charts/chart-edit/chart-edit.component.html
index a8005ae4b..b5b28b085 100644
--- a/frontend/src/app/components/charts/chart-edit/chart-edit.component.html
+++ b/frontend/src/app/components/charts/chart-edit/chart-edit.component.html
@@ -47,7 +47,7 @@ <h3>SQL Query</h3>
                         {{ testing() ? 'Testing...' : 'Test Query' }}
                     </button>
                 </div>
-                <div class="code-editor-box" data-hj-suppress>
+                <div class="code-editor-box" data-ph-no-capture>
                     <ngs-code-editor
                         [theme]="codeEditorTheme"
                         [codeModel]="codeModel()"
diff --git a/frontend/src/app/components/dashboard/db-table-view/db-table-row-view/db-table-row-view.component.html b/frontend/src/app/components/dashboard/db-table-view/db-table-row-view/db-table-row-view.component.html
index cca6a5565..8f19e4724 100644
--- a/frontend/src/app/components/dashboard/db-table-view/db-table-row-view/db-table-row-view.component.html
+++ b/frontend/src/app/components/dashboard/db-table-view/db-table-row-view/db-table-row-view.component.html
@@ -80,7 +80,7 @@ <h2 class="mat-heading-2 row-preview-sidebar__title">Preview</h2>
     <ng-container *ngIf="selectedRow && selectedRow.record; else loadingContent">
         <div *ngFor="let column of columns; let i = index" class="row-preview-sidebar__field">
             <strong>{{column.normalizedTitle}}</strong>
-            <div data-hj-suppress class="row-preview-sidebar__value">
+            <div data-ph-no-capture class="row-preview-sidebar__value">
                 <ng-container *ngIf="isForeignKey(column.title); else recordContent">
                     <app-foreign-key-record-view
                         link="/dashboard/{{selectedRow.connectionID}}/{{selectedRow.foreignKeys[column.title]?.referenced_table_name}}/entry"
diff --git a/frontend/src/app/components/dashboard/db-table-view/db-table-view.component.html b/frontend/src/app/components/dashboard/db-table-view/db-table-view.component.html
index f7328b192..ff179b282 100644
--- a/frontend/src/app/components/dashboard/db-table-view/db-table-view.component.html
+++ b/frontend/src/app/components/dashboard/db-table-view/db-table-view.component.html
@@ -185,7 +185,7 @@ <h2 class="mat-h2 table-name">{{ displayName }}</h2>
 </div>
 
 <div *ngIf="getFiltersCount(activeFilters) !== 0 && !hasSavedFilterActive" class="active-filters">
-    <mat-chip-row *ngFor="let activeFilter of activeFilters | keyvalue" data-hj-suppress
+    <mat-chip-row *ngFor="let activeFilter of activeFilters | keyvalue" data-ph-no-capture
         class="db-table-active-filter-chip"    
         (removed)="removeFilter.emit(activeFilter.key)"
         (click)="handleActiveFilterClick(activeFilter.key)">
@@ -282,7 +282,7 @@ <h2 class="mat-h2 table-name">{{ displayName }}</h2>
                         </button>
                     </mat-menu>
                 </mat-header-cell>
-                <mat-cell *matCellDef="let element; let i = index" [attr.data-label]="tableData.dataNormalizedColumns[column]" class="db-table-cell" data-hj-suppress>
+                <mat-cell *matCellDef="let element; let i = index" [attr.data-label]="tableData.dataNormalizedColumns[column]" class="db-table-cell" data-ph-no-capture>
                     <div class="table-cell-content">
                         <ng-container *ngIf="isForeignKey(column); else contentCell">
                             <app-display-foreign-key
diff --git a/frontend/src/app/components/dashboard/db-table-view/saved-filters-panel/saved-filters-panel.component.html b/frontend/src/app/components/dashboard/db-table-view/saved-filters-panel/saved-filters-panel.component.html
index 378de5096..db7ceccd6 100644
--- a/frontend/src/app/components/dashboard/db-table-view/saved-filters-panel/saved-filters-panel.component.html
+++ b/frontend/src/app/components/dashboard/db-table-view/saved-filters-panel/saved-filters-panel.component.html
@@ -179,7 +179,7 @@
             </div>
         </form>
         <div class="static-filters" *ngIf="savedFilterMap[selectedFilterSetId]?.staticFilters?.length">
-            <mat-chip *ngFor="let filter of savedFilterMap[selectedFilterSetId]?.staticFilters" class="static-filter-chip" data-hj-suppress>
+            <mat-chip *ngFor="let filter of savedFilterMap[selectedFilterSetId]?.staticFilters" class="static-filter-chip" data-ph-no-capture>
                 {{ getFilter(filter) }}
             </mat-chip>
         </div>
diff --git a/frontend/src/app/components/ui-components/record-edit-fields/code/code.component.html b/frontend/src/app/components/ui-components/record-edit-fields/code/code.component.html
index 5f50cc70d..4f13836da 100644
--- a/frontend/src/app/components/ui-components/record-edit-fields/code/code.component.html
+++ b/frontend/src/app/components/ui-components/record-edit-fields/code/code.component.html
@@ -1,6 +1,6 @@
 <span class="mat-body-1">{{ normalizedLabel }} {{ required ? '*' : '' }}</span>
 
-<div class="code-editor-box" data-hj-suppress>
+<div class="code-editor-box" data-ph-no-capture>
     <ngs-code-editor
         [theme]="codeEditorTheme"
         [codeModel]="mutableCodeModel"
diff --git a/frontend/src/app/components/ui-components/record-edit-fields/json-editor/json-editor.component.html b/frontend/src/app/components/ui-components/record-edit-fields/json-editor/json-editor.component.html
index 70c83e140..c2816e35d 100644
--- a/frontend/src/app/components/ui-components/record-edit-fields/json-editor/json-editor.component.html
+++ b/frontend/src/app/components/ui-components/record-edit-fields/json-editor/json-editor.component.html
@@ -1,6 +1,6 @@
 <span class="mat-body-1">{{ normalizedLabel }} {{ required ? '*' : '' }}</span>
 
-<div class="code-editor-box" data-hj-suppress>
+<div class="code-editor-box" data-ph-no-capture>
     <ngs-code-editor
         theme="vs"
         [codeModel]="mutableCodeModel"
diff --git a/frontend/src/app/components/ui-components/record-edit-fields/markdown/markdown.component.html b/frontend/src/app/components/ui-components/record-edit-fields/markdown/markdown.component.html
index f410deb90..7b2927cf4 100644
--- a/frontend/src/app/components/ui-components/record-edit-fields/markdown/markdown.component.html
+++ b/frontend/src/app/components/ui-components/record-edit-fields/markdown/markdown.component.html
@@ -1,6 +1,6 @@
 <span class="mat-body-1">{{ normalizedLabel }} {{ required ? '*' : '' }}</span>
 
-<div class="code-editor-box" data-hj-suppress>
+<div class="code-editor-box" data-ph-no-capture>
     <ngs-code-editor
         [theme]="codeEditorTheme"
         [codeModel]="mutableCodeModel"
diff --git a/frontend/src/main.ts b/frontend/src/main.ts
index f3f8f8995..20dc47bb2 100644
--- a/frontend/src/main.ts
+++ b/frontend/src/main.ts
@@ -85,10 +85,12 @@ if ((environment as any).saas) {
 	});
 }
 
-posthog.init('phc_VPnWHIMj9UjhRLPr7shATjgL0J4KrWWOHkK3JwZbnkw', {
-	api_host: 'https://us.i.posthog.com',
-	defaults: '2025-11-30',
-});
+if ((environment as any).saas) {
+	posthog.init('phc_VPnWHIMj9UjhRLPr7shATjgL0J4KrWWOHkK3JwZbnkw', {
+		api_host: 'https://us.i.posthog.com',
+		defaults: '2025-11-30',
+	});
+}
 
 bootstrapApplication(AppComponent, {
 	providers: [