diff --git a/static/config.json b/static/config.json
index 62c62b6..a8015c6 100644
--- a/static/config.json
+++ b/static/config.json
@@ -43,5 +43,8 @@
 
 	"ignixa_r4": "https://ignixafhirpath.azurewebsites.net/api/$fhirpath-r4",
 	"ignixa_r5": "https://ignixafhirpath.azurewebsites.net/api/$fhirpath-r5",
-	"ignixa_r6": "https://ignixafhirpath.azurewebsites.net/api/$fhirpath-r6"
+	"ignixa_r6": "https://ignixafhirpath.azurewebsites.net/api/$fhirpath-r6",
+
+  "kotlin_server_r4": "https://fhirpath.ohs.dev/fhirpath-r4",
+  "kotlin_server_r5": "https://fhirpath.ohs.dev/fhirpath-r5"
 }
diff --git a/types/fhirpath_test_engine.ts b/types/fhirpath_test_engine.ts
index 89c04a1..ca03be0 100644
--- a/types/fhirpath_test_engine.ts
+++ b/types/fhirpath_test_engine.ts
@@ -27,7 +27,7 @@ export interface IFhirPathEngineDetails {
 
     /** True if this is an external engine (i.e. not running in the same environment as the FHIRPath Lab application */
     external?: boolean;
-   
+
     /** The engine can provide an AST for the expression (otherwise will display that it's not supported) */
     supportsAST: boolean;
 
@@ -317,7 +317,7 @@ export const registeredEngines: { [key: string]: IFhirPathEngineDetails } = {
         supportsAST: true,
         supportsXML: false
     },
-    
+
     "toolbox-go (R4)": {
         name: "toolbox-go",
         legacyName: "toolbox-go (R4)",
@@ -398,6 +398,34 @@ export const registeredEngines: { [key: string]: IFhirPathEngineDetails } = {
         supportsAST: true,
         supportsXML: false
     },
+
+    "Kotlin FHIRPath R4 (Open Health Stack)": {
+      name: "kotlin-fhirpath",
+      legacyName: "Kotlin FHIRPath R4 (Open Health Stack)",
+      fhirVersion: "R4",
+      appInsightsEngineName: "Kotlin",
+      publisher: "Open Health Stack Foundation",
+      configSetting: "kotlin_server_r4",
+      githubRepo: "https://github.com/ohs-foundation/kotlin-fhirpath",
+      description: "A Kotlin implementation of FHIRPath by Open Health Stack.",
+      external: true,
+      supportsAST: false,
+      supportsXML: false
+    },
+
+    "Kotlin FHIRPath R5 (Open Health Stack)": {
+      name: "kotlin-fhirpath",
+      legacyName: "Kotlin FHIRPath R5 (Open Health Stack)",
+      fhirVersion: "R5",
+      appInsightsEngineName: "Kotlin",
+      publisher: "Open Health Stack",
+      configSetting: "kotlin_server_r5",
+      githubRepo: "https://github.com/ohs-foundation/kotlin-fhirpath",
+      description: "A Kotlin implementation of FHIRPath for FHIR R5 by Open Health Stack.",
+      external: true,
+      supportsAST: false,
+      supportsXML: false
+    },
 };
 
 /**