diff --git a/frontend/angular.json b/frontend/angular.json
index ca37178ee..6aaa37af5 100644
--- a/frontend/angular.json
+++ b/frontend/angular.json
@@ -21,7 +21,12 @@
             "assets": [
               "src/favicon.ico",
               "src/assets",
-              "src/config.json"
+              "src/config.json",
+              {
+                "glob": "**/*",
+                "input": "../node_modules/monaco-editor/min",
+                "output": "./assets/monaco"
+              }
             ],
             "styles": [
               "src/custom-theme.scss",
diff --git a/frontend/src/main.ts b/frontend/src/main.ts
index d4524f7b5..1213eb3d9 100644
--- a/frontend/src/main.ts
+++ b/frontend/src/main.ts
@@ -12,7 +12,7 @@ import { Angulartics2Module } from "angulartics2";
 import { AppComponent } from "./app/app.component";
 import { AppRoutingModule } from "./app/app-routing.module";
 import { ClipboardModule } from "@angular/cdk/clipboard";
-import { CodeEditorModule } from "@ngstack/code-editor";
+import { provideCodeEditor } from "@ngstack/code-editor";
 import { ConfigModule } from "./app/modules/config.module";
 import { ConnectionsService } from "./app/services/connections.service";
 import { CookieService } from "ngx-cookie-service";
@@ -76,13 +76,14 @@ if ((environment as any).saas) {
 
 bootstrapApplication(AppComponent, {
     providers: [
-        importProvidersFrom(BrowserModule, AppRoutingModule, FormsModule, ReactiveFormsModule, RouterModule, DynamicModule, Angulartics2Module.forRoot(), ClipboardModule, DragDropModule, MarkdownModule.forRoot(), CodeEditorModule.forRoot({
-		editorVersion: '0.44.0'
-	}),
+        importProvidersFrom(BrowserModule, AppRoutingModule, FormsModule, ReactiveFormsModule, RouterModule, DynamicModule, Angulartics2Module.forRoot(), ClipboardModule, DragDropModule, MarkdownModule.forRoot(),
         // ...saasExtraModules,
         NgxThemeModule.forRoot(colorConfig, {
             frameworks: ['material'], // optional, default : ['tailwind', 'material']
         }), NgxStripeModule.forRoot(stripeKey), ConfigModule.buildForConfigUrl('/config.json')),
+        provideCodeEditor({
+          baseUrl: 'assets/monaco'
+        }),
         PasswordStrengthMeterComponent,
         ConnectionsService,
         UsersService,
diff --git a/package.json b/package.json
index 0189c8da2..9eb32dc83 100644
--- a/package.json
+++ b/package.json
@@ -6,5 +6,8 @@
     "rocketadmin-agent",
     "shared-code"
   ],
-  "packageManager": "yarn@3.4.1"
+  "packageManager": "yarn@3.4.1",
+  "dependencies": {
+    "monaco-editor": "^0.53.0"
+  }
 }
diff --git a/yarn.lock b/yarn.lock
index 7c46cda37..0ddc9f260 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4565,6 +4565,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/trusted-types@npm:^1.0.6":
+  version: 1.0.6
+  resolution: "@types/trusted-types@npm:1.0.6"
+  checksum: 22b8efcb6116ab80d07542047135618ee282f2060c481e472126604d838c09e7dad33c9462d88c130aef2c3133aece516f00d6af7ff814f0612f7d19db720e6d
+  languageName: node
+  linkType: hard
+
 "@types/uuid@npm:^10.0.0":
   version: 10.0.0
   resolution: "@types/uuid@npm:10.0.0"
@@ -10985,6 +10992,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"monaco-editor@npm:^0.53.0":
+  version: 0.53.0
+  resolution: "monaco-editor@npm:0.53.0"
+  dependencies:
+    "@types/trusted-types": ^1.0.6
+  checksum: 353eca219334b62bdf825f4602aa2b98570c60e7059d257b0567da63fbb79b8eee8bea8448a597e297d0c96c9da3be9eb5153c1e8f279e5450d31c83f02125aa
+  languageName: node
+  linkType: hard
+
 "mongodb-connection-string-url@npm:^3.0.0":
   version: 3.0.0
   resolution: "mongodb-connection-string-url@npm:3.0.0"
@@ -12567,6 +12583,8 @@ __metadata:
 "root@workspace:.":
   version: 0.0.0-use.local
   resolution: "root@workspace:."
+  dependencies:
+    monaco-editor: ^0.53.0
   languageName: unknown
   linkType: soft