diff --git a/charts/source-code-analyser/templates/deployment.yaml b/charts/source-code-analyser/templates/deployment.yaml
index 73a23b7..bdbe1e2 100644
--- a/charts/source-code-analyser/templates/deployment.yaml
+++ b/charts/source-code-analyser/templates/deployment.yaml
@@ -28,6 +28,25 @@ spec:
 
         name: code-analysis-lsp-service
 
+      - env:
+          - name: CPG_SERVER_PORT
+            value: {{ quote .Values.source_code_analyser.codePropertyGraphJoern.env.port }}
+        image: {{ .Values.source_code_analyser.codePropertyGraphJoern.image.repository }}:{{ .Values.source_code_analyser.codePropertyGraphJoern.image.tag
+                 | default .Chart.AppVersion }}
+        volumeMounts:
+            - name: source-code
+              mountPath: /data
+        args:
+          - joern
+          - --server
+          - --server-host
+          - 127.0.0.1
+          - --server-port
+          - {{ .Values.source_code_analyser.codePropertyGraphJoern.env.port | quote }}
+
+        name: code-property-graph-joern
+
+
       - name: eclipse-jdtls
         image: hotavneesh/eclipse-jdtls:latest
         volumeMounts:
@@ -50,6 +69,7 @@ spec:
           - extract
           - --SOURCE_CODE_ANALYSER={{ .Values.source_code_analyser.codeAnalysisService.env.sourceCodeAnalyser | quote }}
           - --PORT={{ .Values.source_code_analyser.codeAnalysisService.env.port | int }}
+          - --OPENAI_API_KEY={{ .Values.source_code_analyser.codeAnalysisService.env.openAIKey | quote }}
 
         name: code-analysis-service
 
diff --git a/charts/source-code-analyser/values.yaml b/charts/source-code-analyser/values.yaml
index 52ee295..c652bb6 100644
--- a/charts/source-code-analyser/values.yaml
+++ b/charts/source-code-analyser/values.yaml
@@ -40,6 +40,7 @@ source_code_analyser:
       sourceCodeAnalyser: "true"
       port: 3001
       llmToken: ""
+      openAIKey: ""
     image:
       repository: aktosecurity/akto-puppeteer-replay
       tag: doom_latest
@@ -63,3 +64,16 @@ source_code_analyser:
       limits:
         cpu: 2
         memory: "8Gi"
+  codePropertyGraphJoern:
+    env:
+      port: 8082
+    image:
+      repository: ghcr.io/joernio/joern
+      tag: master
+    resources:
+      requests:
+        cpu: 1
+        memory: "6Gi"
+      limits:
+        cpu: 2
+        memory: "8Gi"