diff --git a/src/platforms/communityConsole/entryPoints/main.ts b/src/platforms/communityConsole/entryPoints/main.ts
index 03d5eba..1f59e20 100644
--- a/src/platforms/communityConsole/entryPoints/main.ts
+++ b/src/platforms/communityConsole/entryPoints/main.ts
@@ -1,21 +1,16 @@
+import EntrypointScriptRunner from '../../../common/architecture/entrypoint/EntrypointScriptRunner';
 import {
   ScriptEnvironment,
   ScriptPage,
   ScriptRunPhase,
 } from '../../../common/architecture/scripts/Script';
-import Features from '../../../features/Features';
-import ScriptRunner from '../../../common/architecture/scripts/ScriptRunner';
 
 // Run legacy Javascript entry point
 import '../../../contentScripts/communityConsole/main';
 
-const features = new Features();
-const scripts = features.getScripts({
+const runner = new EntrypointScriptRunner({
   page: ScriptPage.CommunityConsole,
   environment: ScriptEnvironment.ContentScript,
   runPhase: ScriptRunPhase.Main,
 });
-
-const scriptRunner = new ScriptRunner();
-scriptRunner.add(...scripts);
-scriptRunner.run();
+runner.run();
diff --git a/src/platforms/communityConsole/entryPoints/start.ts b/src/platforms/communityConsole/entryPoints/start.ts
index 2410f2c..c1138a1 100644
--- a/src/platforms/communityConsole/entryPoints/start.ts
+++ b/src/platforms/communityConsole/entryPoints/start.ts
@@ -1,21 +1,16 @@
+import EntrypointScriptRunner from '../../../common/architecture/entrypoint/EntrypointScriptRunner';
 import {
   ScriptEnvironment,
   ScriptPage,
   ScriptRunPhase,
 } from '../../../common/architecture/scripts/Script';
-import Features from '../../../features/Features';
-import ScriptRunner from '../../../common/architecture/scripts/ScriptRunner';
 
 // Run legacy Javascript entry point
 import '../../../contentScripts/communityConsole/start';
 
-const features = new Features();
-const scripts = features.getScripts({
+const runner = new EntrypointScriptRunner({
   page: ScriptPage.CommunityConsole,
   environment: ScriptEnvironment.ContentScript,
   runPhase: ScriptRunPhase.Start,
 });
-
-const scriptRunner = new ScriptRunner();
-scriptRunner.add(...scripts);
-scriptRunner.run();
+runner.run();